chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferencesTest.java - Issue 2229353003: Clean up document-mode specific UI.

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/preferences/website/SiteSettingsPreferencesTest.java

Issue 2229353003: Clean up document-mode specific UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 4 years, 4 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/javatests/src/org/chromium/chrome/browser/policy/CombinedPolicyProviderTest.java ('k') | chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/OpenTabsTest.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/preferences/website/SiteSettingsPreferencesTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferencesTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferencesTest.java

index 79aeac20dbe2917cdbb12c2214e96b9e4f9db08d..b4b9fd0d768f7e2935347234562c4dd73868e1b4 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferencesTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferencesTest.java

@@ -13,7 +13,6 @@ import org.chromium.base.ThreadUtils;

import org.chromium.base.test.util.CommandLineFlags;

import org.chromium.base.test.util.Feature;

import org.chromium.chrome.browser.ChromeActivity;

-import org.chromium.chrome.browser.ChromeApplication;

import org.chromium.chrome.browser.ChromeSwitches;

import org.chromium.chrome.browser.infobar.InfoBarContainer;

import org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference;

@@ -23,7 +22,6 @@ import org.chromium.chrome.browser.preferences.LocationSettings;

import org.chromium.chrome.browser.preferences.PrefServiceBridge;

import org.chromium.chrome.browser.preferences.Preferences;

import org.chromium.chrome.browser.preferences.PreferencesLauncher;

-import org.chromium.chrome.browser.util.FeatureUtilities;

import org.chromium.chrome.test.ChromeActivityTestCaseBase;

import org.chromium.chrome.test.util.InfoBarTestAnimationListener;

import org.chromium.chrome.test.util.browser.LocationSettingsTestUtil;

@@ -613,11 +611,7 @@ public class SiteSettingsPreferencesTest extends ChromeActivityTestCaseBase<Chro

return ThreadUtils.runOnUiThreadBlockingNoException(new Callable<Integer>() {

@Override

public Integer call() throws Exception {

- if (FeatureUtilities.isDocumentMode(getInstrumentation().getTargetContext())) {

- return ChromeApplication.getDocumentTabModelSelector().getTotalTabCount();

- } else {

- return getActivity().getTabModelSelector().getTotalTabCount();

- }

+ return getActivity().getTabModelSelector().getTotalTabCount();

}

});

}