Make WebAPK naming consistent 2/2

webapk/shell_apk/BUILD.gn

Index: webapk/shell_apk/BUILD.gn
diff --git a/webapk/shell_apk/BUILD.gn b/webapk/shell_apk/BUILD.gn
index cc7dd09cd2bab7f22dd560c602df28ee31ad0cb6..ea0788634472fc75442ca0456532cbcf2e270150 100644
--- a/webapk/shell_apk/BUILD.gn
+++ b/webapk/shell_apk/BUILD.gn
@@ -6,7 +6,7 @@ import("//build/config/android/rules.gni")
 
 declare_args() {
   # The origin URL of minted apks, for example: "foo.com"
-  manifest_package_minting_origin = "template"
+  manifest_package_webapk_origin = "template"
 
   # The browser to which WebAPKs will be bound.
   runtime_host = "com.google.android.apps.chrome"
@@ -22,7 +22,7 @@ declare_args() {
   scope = "https://www.template.com"
 }
 
-manifest_package_minting = "org.chromium.webapk"
+manifest_package_webapk = "org.chromium.webapk"
 
 shell_apk_manifest = "$target_gen_dir/shell_apk_manifest/AndroidManifest.xml"
 
@@ -34,7 +34,7 @@ jinja_template("shell_apk_manifest") {
   # AndroidManifest.xml in order for the string substitution in APKMinting.java
   # to work.
   variables = [
-    "manifest_package=$manifest_package_minting.$manifest_package_minting_origin",
+    "manifest_package=$manifest_package_webapk.$manifest_package_webapk_origin",
     "min_sdk_version=16",
     "target_sdk_version=23",
     "host_url=$host_url",
@@ -59,7 +59,7 @@ android_library("dex_loader_lib") {
 # - App icon is extracted from the website and added to the APK's resources.
 android_apk("webapk") {
   android_manifest = shell_apk_manifest
-  apk_name = "WebApk.$manifest_package_minting_origin"
+  apk_name = "WebApk.$manifest_package_webapk_origin"
   native_lib_placeholders = [ "libfoo.so" ]
   java_files = [
     "src/org/chromium/webapk/shell_apk/MainActivity.java",