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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/tab/TabUmaTest.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 clang build error 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

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/tab/TabUmaTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/tab/TabUmaTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/tab/TabUmaTest.java

index 7730c4f2b01b126178cf26cc660b81c2f028f610..67d20e98e49894fda6ad137076d6a2c795ec1114 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/tab/TabUmaTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/tab/TabUmaTest.java

@@ -51,7 +51,7 @@ public class TabUmaTest extends ChromeActivityTestCaseBase<ChromeActivity> {

Tab bgTab = Tab.createTabForLazyLoad(getActivity(), false,

getActivity().getWindowAndroid(), TabLaunchType.FROM_LONGPRESS_BACKGROUND,

Tab.INVALID_TAB_ID, new LoadUrlParams(TEST_URL));

- bgTab.initialize(null, null, true);

+ bgTab.initialize(null, null, null, true);

return bgTab;

}

});

@@ -104,7 +104,7 @@ public class TabUmaTest extends ChromeActivityTestCaseBase<ChromeActivity> {

Tab bgTab = Tab.createLiveTab(Tab.INVALID_TAB_ID, getActivity(), false,

getActivity().getWindowAndroid(), TabLaunchType.FROM_LONGPRESS_BACKGROUND,

Tab.INVALID_TAB_ID, true);

- bgTab.initialize(null, null, true);

+ bgTab.initialize(null, null, null, true);

bgTab.loadUrl(new LoadUrlParams(TEST_URL));

bgTab.show(TabSelectionType.FROM_USER);

return bgTab;

@@ -121,7 +121,7 @@ public class TabUmaTest extends ChromeActivityTestCaseBase<ChromeActivity> {

Tab bgTab = Tab.createLiveTab(Tab.INVALID_TAB_ID, getActivity(), false,

getActivity().getWindowAndroid(), TabLaunchType.FROM_LONGPRESS_BACKGROUND,

Tab.INVALID_TAB_ID, true);

- bgTab.initialize(null, null, true);

+ bgTab.initialize(null, null, null, true);

bgTab.loadUrl(new LoadUrlParams(TEST_URL));

// Simulate the renderer being killed by the OS.

bgTab.simulateRendererKilledForTesting(false);

@@ -140,7 +140,7 @@ public class TabUmaTest extends ChromeActivityTestCaseBase<ChromeActivity> {

Tab bgTab = Tab.createTabForLazyLoad(getActivity(), false,

getActivity().getWindowAndroid(), TabLaunchType.FROM_LONGPRESS_BACKGROUND,

Tab.INVALID_TAB_ID, new LoadUrlParams(TEST_URL));

- bgTab.initialize(null, null, true);

+ bgTab.initialize(null, null, null, true);

bgTab.show(TabSelectionType.FROM_USER);

return bgTab;

}