[Document mode] Force more pathways to use the TabDelegate instead

chrome/android/java_staging/src/org/chromium/chrome/browser/document/DocumentActivity.java

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/document/DocumentActivity.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/document/DocumentActivity.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/document/DocumentActivity.java
index f5b71a7c197410be0c4c5ab20028aa4161a212f8..fe56038fb4ad6b1eb6b9f1b6516cca5a3bb3a1ef 100644
--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/document/DocumentActivity.java
+++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/document/DocumentActivity.java
@@ -31,7 +31,6 @@ import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.KeyboardShortcuts;
 import org.chromium.chrome.browser.Tab;
 import org.chromium.chrome.browser.TabState;
-import org.chromium.chrome.browser.UrlConstants;
 import org.chromium.chrome.browser.UrlUtilities;
 import org.chromium.chrome.browser.appmenu.AppMenuHandler;
 import org.chromium.chrome.browser.appmenu.AppMenuObserver;
@@ -58,6 +57,7 @@ import org.chromium.chrome.browser.tabmodel.document.DocumentTabModel;
 import org.chromium.chrome.browser.tabmodel.document.DocumentTabModel.InitializationObserver;
 import org.chromium.chrome.browser.tabmodel.document.DocumentTabModelImpl;
 import org.chromium.chrome.browser.tabmodel.document.DocumentTabModelSelector;
+import org.chromium.chrome.browser.tabmodel.document.TabDelegate;
 import org.chromium.chrome.browser.toolbar.ToolbarControlContainer;
 import org.chromium.chrome.browser.toolbar.ToolbarHelper;
 import org.chromium.chrome.browser.util.FeatureUtilities;
@@ -777,17 +777,22 @@ public class DocumentActivity extends CompositorChromeActivity {
         return true;
     }
 
+
+    @Override
+    public TabDelegate getTabCreator(boolean incognito) {
+        return (TabDelegate) super.getTabCreator(incognito);
+    }
+
     @Override
     public boolean createContextualSearchTab(ContentViewCore searchContentViewCore) {
         NavigationEntry entry =
                 searchContentViewCore.getWebContents().getNavigationController().getPendingEntry();
         String url = entry != null
                 ? entry.getUrl() : searchContentViewCore.getWebContents().getUrl();
-        PendingDocumentData documentData = new PendingDocumentData();
-        ChromeLauncherActivity.launchDocumentInstance(this, false,
-                ChromeLauncherActivity.LAUNCH_MODE_FOREGROUND, url,
-                DocumentMetricIds.STARTED_BY_CONTEXTUAL_SEARCH,
-                PageTransition.LINK, documentData);
+        getTabCreator(false).createNewDocumentTab(new LoadUrlParams(url, PageTransition.LINK),
+                TabLaunchType.FROM_MENU_OR_OVERVIEW, getActivityTab(),
+                ChromeLauncherActivity.LAUNCH_MODE_FOREGROUND,
+                DocumentMetricIds.STARTED_BY_CONTEXTUAL_SEARCH, null);
         return false;
     }
 
@@ -970,8 +975,6 @@ public class DocumentActivity extends CompositorChromeActivity {
      */
     private void launchNtp(boolean incognito) {
         if (incognito && !PrefServiceBridge.getInstance().isIncognitoModeEnabled()) return;
-        ChromeLauncherActivity.launchDocumentInstance(this, incognito,
-                ChromeLauncherActivity.LAUNCH_MODE_RETARGET, UrlConstants.NTP_URL,
-                DocumentMetricIds.STARTED_BY_OPTIONS_MENU, PageTransition.AUTO_TOPLEVEL, null);
+        getTabCreator(incognito).launchNTP();
     }
 }