Reland of [WebAPKs] Make WebAPK update flow more sensible (patchset #2...

Reland of [WebAPKs] Make WebAPK update flow more sensible (patchset #2 id:90001 of https://codereview.chromium.org/2845943006/ )

Reason for revert:
Reverting the revert now that https://chrome-internal-review.googlesource.com/c/363648/ has landed. That CL should prevent official builder from breaking

Original issue's description:
> Revert of [WebAPKs] Make WebAPK update flow more sensible (patchset #4 id:100001 of https://codereview.chromium.org/2827233006/ )
>
> Reason for revert:
> broke official-* bots, see crbug.com/716330
>
> Original issue's description:
> > [WebAPKs] Make WebAPK update flow more sensible
> >
> > Previously, whenever the shell_apk in shell_apk_version.gni there was a period
> > of time during which
> > - Chrome tries to update the WebAPK because the "shell_apk" version with which
> >   Chrome is compiled with was updated
> > - The WebAPK server is unable to fulfill the update request because the new
> >   ShellAPK has not yet been uploaded to the WebAPK server
> >
> > This CL splits shell_apk_version in shell_apk_version.gni into two variables:
> > |template_shell_apk_version| and |expected_shell_apk_version|
> >
> > The new flow for updating android/webapk/shell_apk will be:
> > 1) Write CL which:
> >    - Makes changes to code in android/webapk/shell_apk
> >    - Increments |template_shell_apk_version|
> >    This will:
> >    - Update the template ShellAPK which is built on the official build bot
> >    - Trigger an alert that the ShellAPK on the WebAPK Minting Server needs to
> >      be updated
> >    - Does not affect the "WebAPK update logic".
> > 2) Upload new ShellAPK template to the WebAPK Minting Server
> >    At this point:
> >    - new WebAPK installs will have the updated shell.
> >    - Chrome will still not request updates to the new ShellAPK version
> > 3) Write CL which:
> >    - Increments |expected_shell_apk_version|
> >    This will:
> >    - cause Chrome to request updates to the new ShellAPK version
> >
> > BUG=708053
> >
> > Review-Url: https://codereview.chromium.org/2827233006
> > Cr-Commit-Position: refs/heads/master@{#467708}
> > Committed: https://chromium.googlesource.com/chromium/src/+/d71abed75b07b4b9fc50591cbeb2b6c8874bf448
>
> TBR=hartmanng@chromium.org,hanxi@chromium.org,zpeng@chromium.org,dominickn@chromium.org,pkotwicz@chromium.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=708053
>
> Review-Url: https://codereview.chromium.org/2845943006
> Cr-Commit-Position: refs/heads/master@{#467966}
> Committed: https://chromium.googlesource.com/chromium/src/+/db08d35eab5d639a6ed751dd4e42dcd5b4f683ec

TBR=hartmanng@chromium.org,hanxi@chromium.org,zpeng@chromium.org,dominickn@chromium.org,timvolodine@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=708053

Review-Url: https://codereview.chromium.org/2847263002
Cr-Commit-Position: refs/heads/master@{#468075}

chrome/android/webapk/libs/client/BUILD.gn

@@ -30,7 +30,7 @@ java_cpp_template("runtime_library_version_java") {
   ]
   defines = [
     "CURRENT_RUNTIME_DEX_VERSION_VALUE=$runtime_library_version",
-    "CURRENT_SHELL_APK_VERSION_VALUE=$shell_apk_version",
+    "CURRENT_SHELL_APK_VERSION_VALUE=$expected_shell_apk_version",
   ]
 }
 

chrome/android/webapk/shell_apk/BUILD.gn

@@ -54,7 +54,7 @@ manifest_processor_template("shell_apk_manifest") {
   output = shell_apk_manifest
 
   variables = [
-    "shell_apk_version=$shell_apk_version",
+    "shell_apk_version=$template_shell_apk_version",
     "manifest_package=org.chromium.webapk",
     "runtime_host=$webapk_runtime_host",
     "start_url=$webapk_start_url",
@@ -81,7 +81,7 @@ manifest_processor_template("shell_apk_manifest_javatests") {
   output = shell_apk_manifest_javatests
 
   variables = [
-    "shell_apk_version=$shell_apk_version",
+    "shell_apk_version=$template_shell_apk_version",
     "manifest_package=org.chromium.webapk.test",
     "runtime_host=org.chromium.chrome",
     "start_url=https://www.template.com/home_page",

chrome/android/webapk/shell_apk/shell_apk_version.gni

@@ -3,5 +3,13 @@
 # found in the LICENSE file.
 
 # Must be incremented whenever code in //chrome/android/webapk/shell_apk
-# (including AndroidManifest.xml) is updated.
-shell_apk_version = 3
+# (including AndroidManifest.xml) is updated. This version should be incremented
+# prior to uploading a new ShellAPK to the WebAPK Minting Server.
+# Does not affect Chrome.apk
+template_shell_apk_version = 4
+
+# The ShellAPK version expected by Chrome. Chrome will try to update the WebAPK
+# if the WebAPK's ShellAPK version is less than |expected_shell_apk_version|.
+# The version should be incremented after a new ShellAPK has been uploaded to
+# the WebAPK Minting Server.
+expected_shell_apk_version = 3