[Android WebAPK]: Remove manifest_package from config

This CL removes the manifest_package from the JSON config. This
enables NewSplashWebApk.apk and WebApk.apk to use the same config.

BUG=899274

Change-Id: Ibcc95142239de6055e60f7cc02f109cbde03408b
Reviewed-on: https://chromium-review.googlesource.com/c/1302105
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Reviewed-by: agrieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#603206}

chrome/android/webapk/shell_apk/BUILD.gn

@@ -94,10 +94,15 @@ template("webapk_tmpl") {
 
   # Generate manifest with test values.
   manifest_mustache_pass(_manifest_target_name) {
-    forward_variables_from(invoker, [ "config_file" ])
+    forward_variables_from(invoker,
+                           [
+                             "apk_package_name",
+                             "config_file",
+                           ])
 
     input = _manifest_to_upload_output
     output = _manifest_output
+    extra_variables = [ "manifest_package=$apk_package_name" ]
     deps = [
       ":$_manifest_to_upload_target_name",
     ]
@@ -208,27 +213,32 @@ java_strings_grd("webapk_strings_grd") {
 webapk_tmpl("webapk") {
   config_file = "manifest/bound_manifest_config.json"
   apk_name = "WebApk"
+  apk_package_name = "org.chromium.webapk"
 }
 
 webapk_tmpl("maps_go_webapk") {
   config_file = "manifest/maps_go_manifest_config.json"
   apk_name = "MapsWebApk"
+  apk_package_name = "org.chromium.maps_go_webapk"
 }
 
 webapk_tmpl("unbound_webapk") {
   config_file = "manifest/unbound_manifest_config.json"
   apk_name = "UnboundWebApk"
+  apk_package_name = "org.chromium.arbitrarypackage"
 }
 
 webapk_tmpl("http_webapk") {
   config_file = "manifest/http_manifest_config.json"
   apk_name = "HttpWebApk"
+  apk_package_name = "org.chromium.webapk.http"
 }
 
 webapk_tmpl("new_splash_webapk") {
   use_new_splash = true
-  config_file = "manifest/new_splash_manifest_config.json"
+  config_file = "manifest/bound_manifest_config.json"
   apk_name = "NewSplashWebApk"
+  apk_package_name = "org.chromium.webapk.new.splash"
 }
 
 android_library("shell_apk_javatests") {

chrome/android/webapk/shell_apk/manifest/bound_manifest_config.json

 {
-  "manifest_package": "org.chromium.webapk",
   "scope_url": "https://pwa.rocks/",
   "intent_filters": {
     "scope_url_scheme": "https",

chrome/android/webapk/shell_apk/manifest/http_manifest_config.json

 {
-  "manifest_package": "org.chromium.webapk.http",
   "scope_url": "http://pwa.rocks/",
   "intent_filters": {
     "scope_url_scheme": "http",

chrome/android/webapk/shell_apk/manifest/maps_go_manifest_config.json

 {
-  "manifest_package": "org.chromium.maps_go_webapk",
   "scope_url": "https://www.google.com/maps",
   "intent_filters": {
     "scope_url_scheme": "https",

chrome/android/webapk/shell_apk/manifest/new_splash_manifest_config.json

-{
-  "manifest_package": "org.chromium.webapk.new.splash",
-  "scope_url": "https://pwa.rocks/",
-  "intent_filters": {
-    "scope_url_scheme": "https",
-    "scope_url_host": "pwa.rocks",
-    "scope_url_path_type": "android:pathPrefix",
-    "scope_url_path": "/"
-  },
-  "start_url": "https://pwa.rocks/",
-  "display_mode": "standalone",
-  "orientation": "portrait",
-  "theme_color": "2147483648L",
-  "background_color": "0L",
-  "has_large_splash_icons": "false",
-  "icon_urls_and_icon_murmur2_hashes": "http://www.pwa.rocks/icon1.png 0 http://www.pwa.rocks/icon2.png 0",
-  "web_manifest_url": "https://pwa.rocks/pwa.webmanifest",
-  "version_code": "1",
-  "version_name": "1.0",
-  "bound_webapk": {
-    "runtime_host": "com.google.android.apps.chrome",
-    "runtime_host_application_name": "Chromium"
-  },
-  "share_template": [{
-	  "index": "0",
-	  "title": "Share All",
-	  "action": "https://pwa.rocks/share.html",
-	  "param_title": "title",
-	  "param_text": "text",
-	  "param_url": "url"
-  },
-  {
-	  "index": "1",
-	  "title": "Share Title",
-	  "action": "https://pwa.rocks/share_title.html",
-	  "param_title": "title",
-	  "param_text": "text",
-	  "param_url": "url"
-  }]
-}

chrome/android/webapk/shell_apk/manifest/unbound_manifest_config.json

 {
-  "manifest_package": "org.chromium.arbitrarypackage",
   "scope_url": "https://pwa.rocks/",
   "intent_filters": {
     "scope_url_scheme": "https",