chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabExternalNavigationTest.java - Issue 1416093004: Remove CustomTab and have all CustomTabActivity using Tab

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

Issue 1416093004: Remove CustomTab and have all CustomTabActivity using Tab (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed tests and nits Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/webapps/FullScreenDelegateFactory.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/tab/TabUmaTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabExternalNavigationTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabExternalNavigationTest.java

index 84461a0fadc33a2e2897074b6303ef20217ac9bb..1b9ae1e6fac85bdefa322c2a6d1d28607ee79961 100644

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

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

@@ -11,12 +11,13 @@ 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;

@@ -63,10 +64,11 @@ public class CustomTabExternalNavigationTest extends CustomTabActivityTestBase {

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();

}

/**