Reland of customtabs: Remove unnecessary Context plumbing.

chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicyTest.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.customtabs;
 
 import android.app.Activity;
 import android.os.AsyncTask;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.MediumTest;
@@ skipping 48 matching lines @@
 @RunWith(ChromeJUnit4ClassRunner.class)
 public class CustomTabTabPersistencePolicyTest {
     private TestTabModelDirectory mMockDirectory;
     private AdvancedMockContext mAppContext;
 
     @Rule
     public UiThreadTestRule mRule = new UiThreadTestRule();
 
     @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());
         ContextUtils.initApplicationContextForTests(mAppContext);
 
         mMockDirectory = new TestTabModelDirectory(
                 mAppContext, "CustomTabTabPersistencePolicyTest",
                 CustomTabTabPersistencePolicy.SAVED_STATE_DIRECTORY);
         TabPersistentStore.setBaseStateDirectoryForTests(mMockDirectory.getBaseDirectory());
     }
@@ skipping 379 matching lines @@
 
         CustomTabActivity activity = new CustomTabActivity();
         ApplicationStatus.onStateChangeForTesting(activity, ActivityState.CREATED);
         TabModelSelectorImpl selector = new TabModelSelectorImpl(
                 activity, activity, buildTestPersistencePolicy(), false, false);
         selector.initializeForTesting(normalTabModel, incognitoTabModel);
         ApplicationStatus.onStateChangeForTesting(activity, ActivityState.DESTROYED);
         return selector;
     }
 }