Start unifying document-mode and tabbed-mode tab creation

chrome/android/javatests_shell/src/org/chromium/chrome/browser/tabmodel/document/DocumentTabModelImplTest.java

Index: chrome/android/javatests_shell/src/org/chromium/chrome/browser/tabmodel/document/DocumentTabModelImplTest.java
diff --git a/chrome/android/javatests_shell/src/org/chromium/chrome/browser/tabmodel/document/DocumentTabModelImplTest.java b/chrome/android/javatests_shell/src/org/chromium/chrome/browser/tabmodel/document/DocumentTabModelImplTest.java
index a9d28b075caa4f676cb49905814acf62731b3b9d..5e96d3c1d4928837e81021a25a44fcf0d1206f84 100644
--- a/chrome/android/javatests_shell/src/org/chromium/chrome/browser/tabmodel/document/DocumentTabModelImplTest.java
+++ b/chrome/android/javatests_shell/src/org/chromium/chrome/browser/tabmodel/document/DocumentTabModelImplTest.java
@@ -18,8 +18,8 @@ import org.chromium.chrome.browser.Tab;
 import org.chromium.chrome.browser.tabmodel.TabModel;
 import org.chromium.chrome.browser.tabmodel.TabModelUtils;
 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;
 
@@ -78,7 +78,7 @@ public class DocumentTabModelImplTest extends NativeLibraryTestBase {
 
     private MockActivityDelegate mActivityDelegate;
     private MockStorageDelegate mStorageDelegate;
-    private MockTabDelegate mTabDelegate;
+    private MockDocumentTabCreatorManager mTabCreatorManager;
     private DocumentTabModel mTabModel;
     private AdvancedMockContext mContext;
 
@@ -89,7 +89,7 @@ public class DocumentTabModelImplTest extends NativeLibraryTestBase {
         loadNativeLibraryAndInitBrowserProcess();
 
         mActivityDelegate = new MockActivityDelegate();
-        mTabDelegate = new MockTabDelegate();
+        mTabCreatorManager = new MockDocumentTabCreatorManager();
         mContext = new AdvancedMockContext(getInstrumentation().getTargetContext());
         mStorageDelegate = new MockStorageDelegate(mContext.getCacheDir());
     }
@@ -112,8 +112,8 @@ public class DocumentTabModelImplTest extends NativeLibraryTestBase {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                mTabModel = new DocumentTabModelImpl(
-                        mActivityDelegate, mStorageDelegate, mTabDelegate, false, 1010, mContext);
+                mTabModel = new DocumentTabModelImpl(mActivityDelegate, mStorageDelegate,
+                        mTabCreatorManager, false, 1010, mContext);
                 mTabModel.startTabStateLoad();
             }
         });