customtabs: Remove unnecessary Context plumbing.

Also removes Context -> Application downcasts in callers.

Review-Url: https://codereview.chromium.org/2966193002
Cr-Commit-Position: refs/heads/master@{#485909}

chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java

@@ -120,7 +120,7 @@ public abstract class AppHooks {
      * outside of {@link CustomTabsConnection#getInstance()}.
      */
     public CustomTabsConnection createCustomTabsConnection() {
-        return new CustomTabsConnection(((ChromeApplication) ContextUtils.getApplicationContext()));
+        return new CustomTabsConnection();
     }
 
     /**

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabObserver.java

@@ -51,7 +51,7 @@ class CustomTabObserver extends EmptyTabObserver {
         if (openedByChrome) {
             mCustomTabsConnection = null;
         } else {
-            mCustomTabsConnection = CustomTabsConnection.getInstance(application);
+            mCustomTabsConnection = CustomTabsConnection.getInstance();
         }
         mSession = session;
         if (!openedByChrome && mCustomTabsConnection.shouldSendNavigationInfoForSession(mSession)) {

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java

@@ -5,7 +5,6 @@
 package org.chromium.chrome.browser.customtabs;
 
 import android.app.ActivityManager;
-import android.app.Application;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
@@ -27,6 +26,7 @@ import android.text.TextUtils;
 import android.util.Pair;
 import android.widget.RemoteViews;
 
+import org.chromium.base.BaseChromiumApplication;
 import org.chromium.base.CommandLine;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
@@ -180,7 +180,7 @@ public class CustomTabsConnection {
 
     @VisibleForTesting
     SpeculationParams mSpeculation;
-    protected final Application mApplication;
+    protected final Context mContext;
     protected final ClientManager mClientManager;
     private final boolean mLogRequests;
     private final AtomicBoolean mWarmupHasBeenCalled = new AtomicBoolean();
@@ -197,21 +197,20 @@ public class CustomTabsConnection {
      * Public to be instanciable from {@link ChromeApplication}. This is however
      * intended to be private.
      */
-    public CustomTabsConnection(Application application) {
+    public CustomTabsConnection() {
         super();
-        mApplication = application;
-        mClientManager = new ClientManager(mApplication);
+        mContext = ContextUtils.getApplicationContext();
+        // Command line switch values are used below.
+        BaseChromiumApplication.initCommandLine(mContext);
+        mClientManager = new ClientManager(mContext);
         mLogRequests = CommandLine.getInstance().hasSwitch(LOG_SERVICE_REQUESTS);
     }
 
     /**
      * @return The unique instance of ChromeCustomTabsConnection.
-     * TODO(estevenson): Remove Application param.
      */
-    @SuppressFBWarnings("BC_UNCONFIRMED_CAST")
-    public static CustomTabsConnection getInstance(Application application) {
+    public static CustomTabsConnection getInstance() {
         if (sInstance.get() == null) {
-            ((ChromeApplication) application).initCommandLine();
             sInstance.compareAndSet(null, AppHooks.get().createCustomTabsConnection());
         }
         return sInstance.get();
@@ -264,17 +263,16 @@ public class CustomTabsConnection {
 
     /** Warmup activities that should only happen once. */
     @SuppressFBWarnings("DM_EXIT")
-    private static void initializeBrowser(final Application app) {
+    private static void initializeBrowser(final Context context) {
         ThreadUtils.assertOnUiThread();
         try {
-            ChromeBrowserInitializer.getInstance(app).handleSynchronousStartupWithGpuWarmUp();
+            ChromeBrowserInitializer.getInstance(context).handleSynchronousStartupWithGpuWarmUp();
         } catch (ProcessInitException e) {
             Log.e(TAG, "ProcessInitException while starting the browser process.");
             // Cannot do anything without the native library, and cannot show a
             // dialog to the user.
             System.exit(-1);
         }
-        final Context context = app.getApplicationContext();
         ChildProcessLauncherHelper.warmUp(context);
         ChromeBrowserInitializer.initNetworkChangeNotifier(context);
         WarmupManager.getInstance().initializeViewHierarchy(
@@ -295,8 +293,8 @@ public class CustomTabsConnection {
     /**
      * @return Whether {@link CustomTabsConnection#warmup(long)} has been called.
      */
-    public static boolean hasWarmUpBeenFinished(Application application) {
-        return getInstance(application).mWarmupHasBeenFinished.get();
+    public static boolean hasWarmUpBeenFinished() {
+        return getInstance().mWarmupHasBeenFinished.get();
     }
 
     /**
@@ -325,7 +323,7 @@ public class CustomTabsConnection {
                     // 4. RequestThrottler first access has to be done only once.
 
                     // (1)
-                    if (!initialized) initializeBrowser(mApplication);
+                    if (!initialized) initializeBrowser(mContext);
 
                     // (2)
                     if (mayCreateSpareWebContents && mSpeculation == null) {
@@ -341,7 +339,7 @@ public class CustomTabsConnection {
                         // The throttling database uses shared preferences, that can cause a
                         // StrictMode violation on the first access. Make sure that this access is
                         // not in mayLauchUrl.
-                        RequestThrottler.loadInBackground(mApplication);
+                        RequestThrottler.loadInBackground(mContext);
                     }
                 } finally {
                     TraceEvent.end("CustomTabsConnection.warmupInternal");
@@ -1009,7 +1007,7 @@ public class CustomTabsConnection {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) {
             do {
                 ActivityManager am =
-                        (ActivityManager) mApplication.getSystemService(Context.ACTIVITY_SERVICE);
+                        (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE);
                 // Extra paranoia here and below, some L 5.0.x devices seem to throw NPE somewhere
                 // in this code.
                 // See https://crbug.com/654705.
@@ -1068,8 +1066,7 @@ public class CustomTabsConnection {
             return SPECULATION_STATUS_ON_START_NOT_ALLOWED_DATA_REDUCTION_ENABLED;
         }
         ConnectivityManager cm =
-                (ConnectivityManager) mApplication.getApplicationContext().getSystemService(
-                        Context.CONNECTIVITY_SERVICE);
+                (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
         if (cm.isActiveNetworkMetered() && !shouldPrerenderOnCellularForSession(session)) {
             return SPECULATION_STATUS_ON_START_NOT_ALLOWED_NETWORK_METERED;
         }
@@ -1165,7 +1162,7 @@ public class CustomTabsConnection {
         if (mExternalPrerenderHandler == null) {
             mExternalPrerenderHandler = new ExternalPrerenderHandler();
         }
-        Rect contentBounds = ExternalPrerenderHandler.estimateContentSize(mApplication, true);
+        Rect contentBounds = ExternalPrerenderHandler.estimateContentSize(mContext, true);
         String referrer = getReferrer(session, extrasIntent);
 
         boolean forced = shouldPrerenderOnCellularForSession(session);
@@ -1220,12 +1217,12 @@ public class CustomTabsConnection {
     }
 
     @VisibleForTesting
-    void resetThrottling(Context context, int uid) {
+    void resetThrottling(int uid) {
         mClientManager.resetThrottling(uid);
     }
 
     @VisibleForTesting
-    void ban(Context context, int uid) {
+    void ban(int uid) {
         mClientManager.ban(uid);
     }
 

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionService.java

@@ -36,7 +36,7 @@ public class CustomTabsConnectionService extends CustomTabsService {
     @Override
     public IBinder onBind(Intent intent) {
         mBindIntent = intent;
-        mConnection = CustomTabsConnection.getInstance(getApplication());
+        mConnection = CustomTabsConnection.getInstance();
         mConnection.logCall("Service#onBind()", true);
         return super.onBind(intent);
     }

chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java

@@ -585,8 +585,8 @@ public class FirstRunActivity extends AsyncInitializationActivity implements Fir
                 public void onSendFinished(PendingIntent pendingIntent, Intent intent,
                         int resultCode, String resultData, Bundle resultExtras) {
                     if (ChromeLauncherActivity.isCustomTabIntent(intent)) {
-                        CustomTabsConnection.getInstance(
-                                getApplication()).sendFirstRunCallbackIfNecessary(intent, complete);
+                        CustomTabsConnection.getInstance().sendFirstRunCallbackIfNecessary(
+                                intent, complete);
                     }
                 }
             };

chrome/android/java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java

@@ -4,7 +4,6 @@
 
 package org.chromium.chrome.browser.prerender;
 
-import android.app.Application;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Point;
@@ -121,20 +120,20 @@ public class ExternalPrerenderHandler {
      * The estimate is likely to be incorrect. This is not a problem, as the aim
      * is to avoid getting a different layout and resources than needed at
      * render time.
-     * @param application The application to use for getting resources.
+     * @param context The application context.
      * @param convertToDp Whether the value should be converted to dp from pixels.
      * @return The estimated prerender size in pixels or dp.
      */
-    public static Rect estimateContentSize(Application application, boolean convertToDp) {
+    public static Rect estimateContentSize(Context context, boolean convertToDp) {
         // The size is estimated as:
         // X = screenSizeX
         // Y = screenSizeY - top bar - bottom bar - custom tabs bar
         // The bounds rectangle includes the bottom bar and the custom tabs bar as well.
         Rect screenBounds = new Rect();
         Point screenSize = new Point();
-        WindowManager wm = (WindowManager) application.getSystemService(Context.WINDOW_SERVICE);
+        WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
         wm.getDefaultDisplay().getSize(screenSize);
-        Resources resources = application.getResources();
+        Resources resources = context.getResources();
         int statusBarId = resources.getIdentifier("status_bar_height", "dimen", "android");
         try {
             screenSize.y -= resources.getDimensionPixelSize(statusBarId);

chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java

@@ -189,7 +189,7 @@ public class SearchActivity extends AsyncInitializationActivity
         if (mQueuedUrl != null) loadUrl(mQueuedUrl);
 
         AutocompleteController.nativePrefetchZeroSuggestResults();
-        CustomTabsConnection.getInstance(getApplication()).warmup(0);
+        CustomTabsConnection.getInstance().warmup(0);
         mSearchBox.onDeferredStartup(isVoiceSearchIntent());
         RecordUserAction.record("SearchWidget.WidgetSelected");
 

chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java

@@ -8,7 +8,6 @@ import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_NON_LOW_E
 import static org.chromium.chrome.browser.customtabs.CustomTabActivityTestRule.LONG_TIMEOUT_MS;
 
 import android.app.Activity;
-import android.app.Application;
 import android.app.Instrumentation;
 import android.app.Instrumentation.ActivityMonitor;
 import android.app.Instrumentation.ActivityResult;
@@ -205,18 +204,13 @@ public class CustomTabActivityTest {
         LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER).ensureInitialized();
         mWebServer = TestWebServer.start();
 
-        CustomTabsConnection connection =
-                CustomTabsConnection.getInstance((Application) appContext);
+        CustomTabsConnection connection = CustomTabsConnection.getInstance();
         connection.setForcePrerender(true);
     }
 
     @After
     public void tearDown() throws Exception {
-        Context appContext = InstrumentationRegistry.getInstrumentation()
-                                     .getTargetContext()
-                                     .getApplicationContext();
-        CustomTabsConnection connection =
-                CustomTabsConnection.getInstance((Application) appContext);
+        CustomTabsConnection connection = CustomTabsConnection.getInstance();
         connection.setForcePrerender(false);
 
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@@ -1012,7 +1006,7 @@ public class CustomTabActivityTest {
         final Intent intent = CustomTabsTestUtils.createMinimalCustomTabIntent(context, mTestPage2);
         final CustomTabsSessionToken session = warmUpAndLaunchUrlWithSession(intent);
         Assert.assertEquals(getActivity().getIntentDataProvider().getSession(), session);
-        CustomTabsConnection connection = CustomTabsConnection.getInstance((Application) context);
+        CustomTabsConnection connection = CustomTabsConnection.getInstance();
         String packageName = context.getPackageName();
         final String referrer =
                 IntentHandler.constructValidReferrerForAuthority(packageName).getUrl();
@@ -2191,8 +2185,7 @@ public class CustomTabActivityTest {
         Context context = InstrumentationRegistry.getInstrumentation()
                                   .getTargetContext()
                                   .getApplicationContext();
-        final CustomTabsConnection connection =
-                CustomTabsConnection.getInstance((Application) context);
+        final CustomTabsConnection connection = CustomTabsConnection.getInstance();
         CustomTabsSessionToken token = CustomTabsSessionToken.createDummySessionTokenForTesting();
         connection.newSession(token);
 
@@ -2681,8 +2674,7 @@ public class CustomTabActivityTest {
         Context context = InstrumentationRegistry.getInstrumentation()
                                   .getTargetContext()
                                   .getApplicationContext();
-        CustomTabsConnection connection =
-                CustomTabsTestUtils.setUpConnection((Application) context);
+        CustomTabsConnection connection = CustomTabsTestUtils.setUpConnection();
         CustomTabsSessionToken token = CustomTabsSessionToken.createDummySessionTokenForTesting();
         connection.newSession(token);
         Bundle extras = null;
@@ -2704,11 +2696,7 @@ public class CustomTabActivityTest {
     }
 
     private CustomTabsConnection warmUpAndWait() {
-        final Context context = InstrumentationRegistry.getInstrumentation()
-                                        .getTargetContext()
-                                        .getApplicationContext();
-        CustomTabsConnection connection =
-                CustomTabsTestUtils.setUpConnection((Application) context);
+        CustomTabsConnection connection = CustomTabsTestUtils.setUpConnection();
         final CallbackHelper startupCallbackHelper = new CallbackHelper();
         Assert.assertTrue(connection.warmup(0));
         ThreadUtils.runOnUiThread(new Runnable() {

chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicyTest.java

@@ -66,6 +66,9 @@ public class CustomTabTabPersistencePolicyTest {
 
     @Before
     public void setUp() throws Exception {
+        // CustomTabsConnection needs a true context, not the mock context set below.
+        CustomTabsConnection.getInstance();
+
         mAppContext = new AdvancedMockContext(InstrumentationRegistry.getInstrumentation()
                                                       .getTargetContext()
                                                       .getApplicationContext());

chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionTest.java

@@ -6,8 +6,6 @@ package org.chromium.chrome.browser.customtabs;
 
 import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_NON_LOW_END_DEVICE;
 
-import android.app.Application;
-import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
@@ -15,7 +13,6 @@ import android.os.Bundle;
 import android.os.Process;
 import android.support.customtabs.CustomTabsService;
 import android.support.customtabs.CustomTabsSessionToken;
-import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 
 import org.junit.After;
@@ -49,17 +46,12 @@ public class CustomTabsConnectionTest {
     private static final String INVALID_SCHEME_URL = "intent://www.google.com";
     private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "chrome";
 
-    private Context mAppContext;
-
     @Before
     public void setUp() throws Exception {
-        mAppContext = InstrumentationRegistry.getInstrumentation()
-                              .getTargetContext()
-                              .getApplicationContext();
         PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX);
         LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER).ensureInitialized();
-        mCustomTabsConnection = CustomTabsTestUtils.setUpConnection((Application) mAppContext);
-        mCustomTabsConnection.resetThrottling(mAppContext, Process.myUid());
+        mCustomTabsConnection = CustomTabsTestUtils.setUpConnection();
+        mCustomTabsConnection.resetThrottling(Process.myUid());
     }
 
     @After
@@ -155,7 +147,7 @@ public class CustomTabsConnectionTest {
     @SmallTest
     @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
     public void testPrerenderDestroysSpareRenderer() {
-        CustomTabsConnection.getInstance((Application) mAppContext).setForcePrerender(true);
+        CustomTabsConnection.getInstance().setForcePrerender(true);
         final CustomTabsSessionToken token = assertWarmupAndMayLaunchUrl(null, URL, true);
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
@@ -305,7 +297,7 @@ public class CustomTabsConnectionTest {
     @SmallTest
     @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
     public void testStillHighConfidenceMayLaunchUrlWithSeveralUrls() {
-        CustomTabsConnection.getInstance((Application) mAppContext).setForcePrerender(true);
+        CustomTabsConnection.getInstance().setForcePrerender(true);
         final CustomTabsSessionToken token =
                 CustomTabsSessionToken.createDummySessionTokenForTesting();
         Assert.assertTrue(mCustomTabsConnection.newSession(token));
@@ -352,7 +344,7 @@ public class CustomTabsConnectionTest {
     @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
     @RetryOnFailure
     public void testCanCancelPrerender() {
-        CustomTabsConnection.getInstance((Application) mAppContext).setForcePrerender(true);
+        CustomTabsConnection.getInstance().setForcePrerender(true);
         final CustomTabsSessionToken token = assertWarmupAndMayLaunchUrl(null, URL, true);
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
@@ -439,9 +431,9 @@ public class CustomTabsConnectionTest {
     @SmallTest
     public void testMultipleMayLaunchUrl() {
         CustomTabsSessionToken token = assertWarmupAndMayLaunchUrl(null, URL, true);
-        mCustomTabsConnection.resetThrottling(mAppContext, Process.myUid());
+        mCustomTabsConnection.resetThrottling(Process.myUid());
         assertWarmupAndMayLaunchUrl(token, URL, true);
-        mCustomTabsConnection.resetThrottling(mAppContext, Process.myUid());
+        mCustomTabsConnection.resetThrottling(Process.myUid());
         assertWarmupAndMayLaunchUrl(token, URL2, true);
     }
 
@@ -545,9 +537,9 @@ public class CustomTabsConnectionTest {
     @SmallTest
     public void testThrottlingAcrossSessions() {
         CustomTabsSessionToken token = assertWarmupAndMayLaunchUrl(null, URL, true);
-        mCustomTabsConnection.resetThrottling(mAppContext, Process.myUid());
+        mCustomTabsConnection.resetThrottling(Process.myUid());
         CustomTabsSessionToken token2 = assertWarmupAndMayLaunchUrl(null, URL, true);
-        mCustomTabsConnection.resetThrottling(mAppContext, Process.myUid());
+        mCustomTabsConnection.resetThrottling(Process.myUid());
         for (int i = 0; i < 10; i++) {
             mCustomTabsConnection.mayLaunchUrl(token, Uri.parse(URL), null, null);
         }
@@ -558,7 +550,7 @@ public class CustomTabsConnectionTest {
     @SmallTest
     @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
     public void testBanningWorks() {
-        mCustomTabsConnection.ban(mAppContext, Process.myUid());
+        mCustomTabsConnection.ban(Process.myUid());
         final CustomTabsSessionToken token =
                 CustomTabsSessionToken.createDummySessionTokenForTesting();
         Assert.assertTrue(mCustomTabsConnection.newSession(token));
@@ -578,7 +570,7 @@ public class CustomTabsConnectionTest {
     @SmallTest
     @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
     public void testBanningDisabledForCellular() {
-        mCustomTabsConnection.ban(mAppContext, Process.myUid());
+        mCustomTabsConnection.ban(Process.myUid());
         final CustomTabsSessionToken token =
                 CustomTabsSessionToken.createDummySessionTokenForTesting();
         Assert.assertTrue(mCustomTabsConnection.newSession(token));

chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsTestUtils.java

@@ -4,7 +4,6 @@
 
 package org.chromium.chrome.browser.customtabs;
 
-import android.app.Application;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -38,9 +37,9 @@ public class CustomTabsTestUtils {
         return intent;
     }
 
-    public static CustomTabsConnection setUpConnection(Application application) {
-        CustomTabsConnection connection = CustomTabsConnection.getInstance(application);
-        connection.resetThrottling(application, Process.myUid());
+    public static CustomTabsConnection setUpConnection() {
+        CustomTabsConnection connection = CustomTabsConnection.getInstance();
+        connection.resetThrottling(Process.myUid());
         return connection;
     }