Revert "[WebAPKs] Make WebAPK update flow more sensible"

chrome/android/webapk/shell_apk/BUILD.gn

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/android/rules.gni")
 import("manifest_processor.gni")
 import("shell_apk_version.gni")
 
 declare_args() {
   # The browser that the WebAPK will be bound to.
@@ skipping 36 matching lines @@
 
 shell_apk_manifest = "$target_gen_dir/shell_apk_manifest/AndroidManifest.xml"
 shell_apk_manifest_javatests =
     "$target_gen_dir/shell_apk_manifest_javatests/AndroidManifest.xml"
 
 manifest_processor_template("shell_apk_manifest") {
   input = "AndroidManifest.xml"
   output = shell_apk_manifest
 
   variables = [
-    "shell_apk_version=$template_shell_apk_version",
+    "shell_apk_version=$shell_apk_version",
     "manifest_package=org.chromium.webapk",
     "runtime_host=$webapk_runtime_host",
     "start_url=$webapk_start_url",
     "name=$webapk_name",
     "short_name=$webapk_short_name",
     "scope_url=$webapk_scope_url",
     "display_mode=$webapk_display_mode",
     "orientation=$webapk_orientation",
     "theme_color=$webapk_theme_color",
     "background_color=$webapk_background_color",
     "icon_urls_and_icon_murmur2_hashes=$webapk_icon_urls_and_icon_murmur2_hashes",
     "scope_url_scheme=$webapk_scope_url_scheme",
     "scope_url_host=$webapk_scope_url_host",
     "scope_url_path=$webapk_scope_url_path",
     "web_manifest_url=$webapk_web_manifest_url",
     "version_code=$webapk_version_code",
     "version_name=$webapk_version_name",
   ]
 }
 
 # Manifest for instrumentation tests. Cannot be customized via GN args.
 manifest_processor_template("shell_apk_manifest_javatests") {
   input = "AndroidManifest.xml"
   output = shell_apk_manifest_javatests
 
   variables = [
-    "shell_apk_version=$template_shell_apk_version",
+    "shell_apk_version=$shell_apk_version",
     "manifest_package=org.chromium.webapk.test",
     "runtime_host=org.chromium.chrome",
     "start_url=https://www.template.com/home_page",
     "name=Test",
     "short_name=Test",
     "scope_url=https://www.template.com",
     "display_mode=standalone",
     "orientation=portrait",
     "theme_color=2147483648L",  # HostBrowserLauncher#MANIFEST_COLOR_INVALID_OR_MISSING
     "background_color=2147483648L",  # HostBrowserLauncher#MANIFEST_COLOR_INVALID_OR_MISSING
@@ skipping 93 matching lines @@
   java_files = [
     "junit/src/org/chromium/webapk/shell_apk/HostBrowserClassLoaderTest.java",
     "junit/src/org/chromium/webapk/shell_apk/MainActivityTest.java",
   ]
   deps = [
     ":webapk_java",
     "//chrome/android/webapk/libs/common:common_java",
     "//chrome/android/webapk/test:junit_test_support",
   ]
 }