chrome/android/javatests/src/org/chromium/chrome/browser/document/DocumentModeTestBase.java - Issue 2013883002: ✈ Remove unnecessary flag and DocumentModeManager.

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/document/DocumentModeTestBase.java

Issue 2013883002: ✈ Remove unnecessary flag and DocumentModeManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 7 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/util/FeatureUtilities.java ('K') | « chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadTest.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/document/DocumentModeTestBase.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/document/DocumentModeTestBase.java b/chrome/android/javatests/src/org/chromium/chrome/browser/document/DocumentModeTestBase.java

index 1c8995e4e7cf5364c1edcce00fd278274122827a..7aac4c80580bb024a194d87ce13211f2263dff53 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/document/DocumentModeTestBase.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/document/DocumentModeTestBase.java

@@ -20,9 +20,9 @@ import org.chromium.chrome.R;

import org.chromium.chrome.browser.ChromeApplication;

import org.chromium.chrome.browser.ChromeTabbedActivity;

import org.chromium.chrome.browser.IntentHandler;

-import org.chromium.chrome.browser.preferences.DocumentModeManager;

import org.chromium.chrome.browser.tab.EmptyTabObserver;

import org.chromium.chrome.browser.tab.Tab;

+import org.chromium.chrome.browser.tabmodel.DocumentModeAssassin;

import org.chromium.chrome.browser.tabmodel.TabModel;

import org.chromium.chrome.browser.tabmodel.TabModelUtils;

import org.chromium.chrome.browser.tabmodel.document.AsyncTabCreationParams;

@@ -81,18 +81,14 @@ public class DocumentModeTestBase extends MultiActivityTestBase {

@Override

public void setUp() throws Exception {

super.setUp();

- DocumentModeManager documentModeManager = DocumentModeManager.getInstance(

- getInstrumentation().getTargetContext());

- mPreviouslyOptedOut = documentModeManager.isOptedOutOfDocumentMode();

- documentModeManager.setOptedOutState(DocumentModeManager.OPT_OUT_PROMO_DISMISSED);

+ mPreviouslyOptedOut = DocumentModeAssassin.isOptedOutOfDocumentMode();

+ DocumentModeAssassin.setOptedOutState(DocumentModeAssassin.OPT_OUT_PROMO_DISMISSED);

}

@Override

public void tearDown() throws Exception {

if (mPreviouslyOptedOut) {

- DocumentModeManager documentModeManager = DocumentModeManager.getInstance(

- getInstrumentation().getTargetContext());

- documentModeManager.setOptedOutState(DocumentModeManager.OPTED_OUT_OF_DOCUMENT_MODE);

+ DocumentModeAssassin.setOptedOutState(DocumentModeAssassin.OPTED_OUT_OF_DOCUMENT_MODE);

}

super.tearDown();

}