Commment signed webapks working and verified.

chrome/android/java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHost.java

 // Copyright 2016 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.
 
 package org.chromium.chrome.browser.webapps;
 
 import android.os.StrictMode;
 
+import org.chromium.base.CommandLine;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.chrome.browser.AppHooks;
 import org.chromium.chrome.browser.ChromeFeatureList;
+import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.GooglePlayInstallState;
 import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
 import org.chromium.chrome.browser.externalauth.UserRecoverableErrorHandler;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
 import org.chromium.webapk.lib.client.WebApkValidator;
 
 /**
  * Contains functionality needed for Chrome to host WebAPKs.
  */
 public class ChromeWebApkHost {
     private static final String TAG = "ChromeWebApkHost";
 
     /** Whether installing WebAPks from Google Play is possible. */
     private static Integer sGooglePlayInstallState;
 
     private static Boolean sEnabledForTesting;
 
     public static void init() {
-        WebApkValidator.initWithBrowserHostSignature(ChromeWebApkHostSignature.EXPECTED_SIGNATURE);
+        WebApkValidator.init(isAnyPackageNameEnabledInPrefs(),
+                ChromeWebApkHostSignature.EXPECTED_SIGNATURE, ChromeWebApkHostSignature.PUBLIC_KEY);
     }
 
     public static void initForTesting(boolean enabled) {
         sEnabledForTesting = enabled;
         sGooglePlayInstallState = enabled ? GooglePlayInstallState.SUPPORTED
                                           : GooglePlayInstallState.NO_PLAY_SERVICES;
     }
 
     public static boolean isEnabled() {
         if (sEnabledForTesting != null) return sEnabledForTesting;
@@ skipping 47 matching lines @@
         // Will go away once the feature is enabled for everyone by default.
         StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
         try {
             return ChromePreferenceManager.getInstance().getCachedWebApkRuntimeEnabled();
         } finally {
             StrictMode.setThreadPolicy(oldPolicy);
         }
     }
 
     /**
+     * Check the cached value to figure out if any WebAPK package name may be used. We have to use
+     * the cached value because native library may not yet been loaded.
+     * @return Whether the feature is enabled.
+     */
+    private static boolean isAnyPackageNameEnabledInPrefs() {
+        // Will go away once the feature is enabled for everyone by default.
+        StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
+        try {
+            return ChromePreferenceManager.getInstance().getCachedWebApkAnyPackageName();
+        } finally {
+            StrictMode.setThreadPolicy(oldPolicy);
+        }
+    }
+
+    /**
      * Once native is loaded we can consult the command-line (set via about:flags) and also finch
      * state to see if we should enable WebAPKs.
      */
     public static void cacheEnabledStateForNextLaunch() {
         ChromePreferenceManager preferenceManager = ChromePreferenceManager.getInstance();
 
         boolean wasEnabled = isEnabledInPrefs();
         boolean isEnabled = ChromeFeatureList.isEnabled(ChromeFeatureList.IMPROVED_A2HS);
         if (isEnabled != wasEnabled) {
             Log.d(TAG, "WebApk setting changed (%s => %s)", wasEnabled, isEnabled);
             preferenceManager.setCachedWebApkRuntimeEnabled(isEnabled);
         }
+
+        boolean wasAnyPackgeNameEnabled = isAnyPackageNameEnabledInPrefs();
+        boolean isAnyPackgeNameEnabled =

[Yaron, 2017/04/13 20:50:51]

isAnyPackageNameEnabled

[ScottK, 2017/04/13 21:00:48]

Done.

+                CommandLine.getInstance().hasSwitch(ChromeSwitches.ENABLE_ANY_WEBAPK_PACKAGE_NAME);
+        if (wasAnyPackgeNameEnabled != isAnyPackgeNameEnabled) {
+            Log.d(TAG, "WebApk Any Package name setting changed (%s => %s)", wasEnabled, isEnabled);
+            preferenceManager.setCachedWebApkAnyPackageNameEnabled(isEnabled);
+        }
     }
 
     private static native boolean nativeCanLaunchRendererInWebApkProcess();
 }