chrome/android/javatests_shell/src/org/chromium/chrome/browser/tabmodel/document/OffTheRecordDocumentTabModelTest.java - Issue 1176943002: Start unifying document-mode and tabbed-mode tab creation

Unified Diff: chrome/android/javatests_shell/src/org/chromium/chrome/browser/tabmodel/document/OffTheRecordDocumentTabModelTest.java

Issue 1176943002: Start unifying document-mode and tabbed-mode tab creation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Comment Created 5 years, 6 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_shell/src/org/chromium/chrome/browser/tabmodel/document/DocumentTabModelImplTest.java ('k') | chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/tabmodel/document/MockDocumentTabCreatorManager.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests_shell/src/org/chromium/chrome/browser/tabmodel/document/OffTheRecordDocumentTabModelTest.java

diff --git a/chrome/android/javatests_shell/src/org/chromium/chrome/browser/tabmodel/document/OffTheRecordDocumentTabModelTest.java b/chrome/android/javatests_shell/src/org/chromium/chrome/browser/tabmodel/document/OffTheRecordDocumentTabModelTest.java

index 82f91dce1fdbc2c1dc0fe7dec377f83bc3b15145..9a21a3868ef9cf9f3c8ef1632e19bb46a7414c1b 100644

--- a/chrome/android/javatests_shell/src/org/chromium/chrome/browser/tabmodel/document/OffTheRecordDocumentTabModelTest.java

+++ b/chrome/android/javatests_shell/src/org/chromium/chrome/browser/tabmodel/document/OffTheRecordDocumentTabModelTest.java

@@ -16,8 +16,8 @@ import org.chromium.chrome.browser.profiles.Profile;

import org.chromium.chrome.browser.tabmodel.OffTheRecordTabModel.OffTheRecordTabModelDelegate;

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

import org.chromium.chrome.test.util.browser.tabmodel.document.MockActivityDelegate;

+import org.chromium.chrome.test.util.browser.tabmodel.document.MockDocumentTabCreatorManager;

import org.chromium.chrome.test.util.browser.tabmodel.document.MockStorageDelegate;

-import org.chromium.chrome.test.util.browser.tabmodel.document.MockTabDelegate;

import org.chromium.chrome.test.util.browser.tabmodel.document.TestInitializationObserver;

import org.chromium.content.browser.test.NativeLibraryTestBase;

@@ -31,7 +31,7 @@ import org.chromium.content.browser.test.NativeLibraryTestBase;

public class OffTheRecordDocumentTabModelTest extends NativeLibraryTestBase {

private MockActivityDelegate mActivityDelegate;

private MockStorageDelegate mStorageDelegate;

- private MockTabDelegate mTabDelegate;

+ private MockDocumentTabCreatorManager mTabCreatorManager;

private OffTheRecordDocumentTabModel mTabModel;

private Profile mProfile;

@@ -48,7 +48,7 @@ public class OffTheRecordDocumentTabModelTest extends NativeLibraryTestBase {

mContext = getInstrumentation().getTargetContext();

mStorageDelegate = new MockStorageDelegate(mContext.getCacheDir());

mActivityDelegate = new MockActivityDelegate();

- mTabDelegate = new MockTabDelegate();

+ mTabCreatorManager = new MockDocumentTabCreatorManager();

}

private void createTabModel() {

@@ -57,8 +57,8 @@ public class OffTheRecordDocumentTabModelTest extends NativeLibraryTestBase {

@Override

public TabModel createTabModel() {

- mModel = new DocumentTabModelImpl(mActivityDelegate, mStorageDelegate, mTabDelegate,

- true, Tab.INVALID_TAB_ID, mContext);

+ mModel = new DocumentTabModelImpl(mActivityDelegate, mStorageDelegate,

+ mTabCreatorManager, true, Tab.INVALID_TAB_ID, mContext);

return mModel;

}