Remove CustomTab and have all CustomTabActivity using Tab

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

 // Copyright 2015 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.Bundle;
 import android.test.FlakyTest;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.ThreadUtils;
-import org.chromium.chrome.browser.customtabs.CustomTab.CustomTabNavigationDelegate;
+import org.chromium.chrome.browser.customtabs.CustomTabDelegateFactory.CustomTabNavigationDelegate;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler.OverrideUrlLoadingResult;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationParams;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;
+import org.chromium.chrome.browser.tab.TabDelegateFactory;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.test.util.TestHttpServerClient;
 import org.chromium.content.browser.test.util.CallbackHelper;
 import org.chromium.content_public.browser.LoadUrlParams;
 
 import java.util.concurrent.TimeoutException;
 
 /**
  * Instrumentation test for external navigation handling in a {@link CustomTab}.
@@ skipping 26 matching lines @@
             "chrome/test/data/android/google.html");
     private ExternalNavigationHandler mUrlHandler;
     private CustomTabNavigationDelegate mNavigationDelegate;
 
     @Override
     public void startMainActivity() throws InterruptedException {
         super.startMainActivity();
         startCustomTabActivityWithIntent(CustomTabsTestUtils.createMinimalCustomTabIntent(
                 getInstrumentation().getTargetContext(), TEST_URL, null));
         Tab tab = getActivity().getActivityTab();
-        assertTrue("A custom tab is not present in the activity.", tab instanceof CustomTab);
-        CustomTab customTab = (CustomTab) tab;
-        mUrlHandler = customTab.getExternalNavigationHandler();
-        mNavigationDelegate = customTab.getExternalNavigationDelegate();
+        TabDelegateFactory delegateFactory = tab.getDelegateFactoryForTest();
+        assert delegateFactory instanceof CustomTabDelegateFactory;
+        mUrlHandler = ((CustomTabDelegateFactory) delegateFactory).getExternalNavigationHandler();
+        mNavigationDelegate = ((CustomTabDelegateFactory) delegateFactory)
+                .getExternalNavigationDelegate();
     }
 
     /**
      * For urls with special schemes and hosts, and there is exactly one activity having a matching
      * intent filter, the framework will make that activity the default handler of the special url.
      * This test tests whether chrome is able to start the default external handler.
      */
     @SmallTest
     public void testExternalActivityStartedForDefaultUrl() {
         final String testUrl = "customtab://customtabtest/intent";
@@ skipping 48 matching lines @@
                         false);
             }
         });
 
         loadUrlHelper.waitForCallback(0, 1);
         assertTrue("A new tab should not have been created.",
                 ApplicationStatus.getLastTrackedFocusedActivity() == getActivity());
         assertEquals(testUrl, getActivity().getActivityTab().getUrl());
     }
 }