🙅 Bind a WebAPK to its "host" browser.

chrome/android/java/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateImpl.java

Index: chrome/android/java/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateImpl.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateImpl.java
index ecdc48637f4eaf8a1ba4c3a3710ab655f1c01371..82537f670da75aadb47c1c34fc1983ce4c2b6cb2 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateImpl.java
@@ -4,9 +4,7 @@
 
 package org.chromium.chrome.browser.tab;
 
-import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
@@ -23,7 +21,6 @@ import org.chromium.content_public.browser.WebContents;
 import org.chromium.content_public.common.ConsoleMessageLevel;
 import org.chromium.minting.lib.client.NavigationClient;
 import org.chromium.minting.lib.client.WebAPKValidator;
-import org.chromium.minting.lib.common.WebAPKConstants;
 
 /**
  * Class that controls navigations and allows to intercept them. It is used on Android to 'convert'
@@ -33,14 +30,12 @@ import org.chromium.minting.lib.common.WebAPKConstants;
 public class InterceptNavigationDelegateImpl implements InterceptNavigationDelegate {
     private static final String CHROME_LAUNCH_ACTIVITY =
             "org.chromium.chrome.browser.document.ChromeLauncherActivity";
-    private static final String DEFAULT_CHROME_PACKAGE_NAME = "com.google.android.apps.chrome";
 
     private final Tab mTab;
     private final ExternalNavigationHandler mExternalNavHandler;
     private final AuthenticatorNavigationInterceptor mAuthenticatorHelper;
     private ExternalNavigationHandler.OverrideUrlLoadingResult mLastOverrideUrlLoadingResult =
             ExternalNavigationHandler.OverrideUrlLoadingResult.NO_OVERRIDE;
-    private String mChromePackageFromPref = null;
 
     /**
      * Whether forward history should be cleared after navigation is committed.
@@ -136,8 +131,8 @@ public class InterceptNavigationDelegateImpl implements InterceptNavigationDeleg
             case OVERRIDE_WITH_INTENT_TO_MINTED_APK:
                 onOverrideUrlLoadingAndLaunchIntentToMintedAPK(url);
                 return true;
-            case OVERRIDE_WITH_INTENT_BACKTO_CHROME:
-                onOverrideUrlLoadingBackToChrome(url);
+            case OVERRIDE_WITH_INTENT_BACKTO_HOST_BROWSER:
+                onOverrideUrlLoadingBackToHostBrowser(url);
                 return true;
             case NO_OVERRIDE:
             default:
@@ -251,16 +246,10 @@ public class InterceptNavigationDelegateImpl implements InterceptNavigationDeleg
         mTab.getActivity().startActivity(intent);
     }
 
-    private void onOverrideUrlLoadingBackToChrome(String url) {
-        if (mChromePackageFromPref == null) {
-            SharedPreferences prefs = mTab.getActivity().getSharedPreferences(
-                    WebAPKConstants.MINT_PREFS, Context.MODE_PRIVATE);
-            mChromePackageFromPref = prefs.getString(WebAPKConstants.HOST_PACKAGE_PREF,
-                    DEFAULT_CHROME_PACKAGE_NAME);
-        }
+    private void onOverrideUrlLoadingBackToHostBrowser(String url) {
         mTab.getActivity().startActivity(
                 NavigationClient.createIntentToNavigateBackToHost(
-                mChromePackageFromPref, url, CHROME_LAUNCH_ACTIVITY));
+                mTab.getApplicationContext(), url, CHROME_LAUNCH_ACTIVITY));
     }
 
     private void logBlockedNavigationToDevToolsConsole(String url) {