Remove originalIntent parameter from AsyncTabParams.

It is unused.

Change-Id: I3ae92bb98164e450e263f269a67e01aa84d94d9b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2203022Reviewed-by: David Trainor <dtrainor@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#770267}

chrome/android/java/src/org/chromium/chrome/browser/night_mode/NightModeReparentingController.java

@@ -65,7 +65,7 @@ public class NightModeReparentingController implements NightModeStateProvider.Ob
             // state themselves.
             if (mDelegate.isNTPUrl(tab.getUrlString())) continue;
 
-            TabReparentingParams params = new TabReparentingParams(tab, null, null);
+            TabReparentingParams params = new TabReparentingParams(tab, null);
             AsyncTabParamsManager.add(tab.getId(), params);
             ReparentingTask.from(tab).detach();
         }

chrome/android/java/src/org/chromium/chrome/browser/tab_activity_glue/ReparentingTask.java

@@ -119,7 +119,7 @@ public class ReparentingTask implements UserData {
             // ensure the global count of tabs is correct. See https://crbug.com/611806.
             intent.putExtra(IntentHandler.EXTRA_TAB_ID, mTab.getId());
             AsyncTabParamsManager.add(
-                    mTab.getId(), new TabReparentingParams(mTab, intent, finalizeCallback));
+                    mTab.getId(), new TabReparentingParams(mTab, finalizeCallback));
 
             detach();
         }

chrome/android/java/src/org/chromium/chrome/browser/tabmodel/AsyncTabParams.java

@@ -5,7 +5,6 @@
 package org.chromium.chrome.browser.tabmodel;
 
 import android.content.ComponentName;
-import android.content.Intent;
 
 import androidx.annotation.Nullable;
 
@@ -23,11 +22,6 @@ public interface AsyncTabParams {
      */
     LoadUrlParams getLoadUrlParams();
 
-    /**
-     * @return The original {@link Intent} that contains this {@link AsyncTabParams}.
-     */
-    @Nullable Intent getOriginalIntent();
-
     /**
      * @return The request ID (tab ID) for this {@link AsyncTabParams}.
      */

chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabReparentingParams.java

@@ -5,7 +5,6 @@
 package org.chromium.chrome.browser.tabmodel;
 
 import android.content.ComponentName;
-import android.content.Intent;
 
 import androidx.annotation.Nullable;
 
@@ -17,19 +16,14 @@ import org.chromium.content_public.browser.WebContents;
  * Class for handling tab reparenting operations across multiple activities.
  */
 public class TabReparentingParams implements AsyncTabParams {
-    private static final int TAB_INDEX_NOT_SET = -1;
-
     private final Tab mTabToReparent;
-    private final Intent mOriginalIntent;
     private final Runnable mFinalizeCallback;
 
     /**
      * Basic constructor for {@link TabReparentingParams}.
      */
-    public TabReparentingParams(
-            Tab tabToReparent, Intent originalIntent, Runnable finalizeCallback) {
+    public TabReparentingParams(Tab tabToReparent, Runnable finalizeCallback) {
         mTabToReparent = tabToReparent;
-        mOriginalIntent = originalIntent;
         mFinalizeCallback = finalizeCallback;
     }
 
@@ -38,11 +32,6 @@ public class TabReparentingParams implements AsyncTabParams {
         return null;
     }
 
-    @Override
-    public Intent getOriginalIntent() {
-        return mOriginalIntent;
-    }
-
     @Override
     public Integer getRequestId() {
         return null;
@@ -63,10 +52,6 @@ public class TabReparentingParams implements AsyncTabParams {
         return mTabToReparent;
     }
 
-    public boolean hasTabToReparent() {
-        return mTabToReparent != null;
-    }
-
     /**
      * Returns the callback to be used once Tab reparenting has finished, if any.
      */

chrome/android/java/src/org/chromium/chrome/browser/tabmodel/document/AsyncTabCreationParams.java

@@ -5,10 +5,8 @@
 package org.chromium.chrome.browser.tabmodel.document;
 
 import android.content.ComponentName;
-import android.content.Intent;
 
 import org.chromium.chrome.browser.ServiceTabLauncher;
-import org.chromium.chrome.browser.document.ChromeLauncherActivity;
 import org.chromium.chrome.browser.offlinepages.downloads.OfflinePageDownloadBridge;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.AsyncTabParams;
@@ -23,9 +21,6 @@ public class AsyncTabCreationParams implements AsyncTabParams {
     /** Parameters used for opening a URL in the new Tab. */
     private final LoadUrlParams mLoadUrlParams;
 
-    /** The original intent. Set only by the {@link ChromeLauncherActivity}. */
-    private final Intent mOriginalIntent;
-
     /** WebContents object to initialize the Tab with. Set only by the {@link TabDelegate}. */
     private final WebContents mWebContents;
 
@@ -37,24 +32,24 @@ public class AsyncTabCreationParams implements AsyncTabParams {
 
     /** Create parameters for creating a Tab asynchronously. */
     public AsyncTabCreationParams(LoadUrlParams loadUrlParams) {
-        this(loadUrlParams, null, null, null, null);
+        this(loadUrlParams, null, null, null);
     }
 
     /** Called by {@link TabDelegate} for creating new a Tab with a pre-existing WebContents. */
     public AsyncTabCreationParams(LoadUrlParams loadUrlParams, WebContents webContents) {
-        this(loadUrlParams, null, webContents, null, null);
+        this(loadUrlParams, webContents, null, null);
         assert webContents != null;
     }
 
     /** Called by {@link ServiceTabLauncher} to create tabs via service workers. */
     public AsyncTabCreationParams(LoadUrlParams loadUrlParams, Integer requestId) {
-        this(loadUrlParams, null, null, requestId, null);
+        this(loadUrlParams, null, requestId, null);
         assert requestId != null;
     }
 
     /** Called by {@link OfflinePageDownloadBridge} to create tabs for Offline Pages. */
     public AsyncTabCreationParams(LoadUrlParams loadUrlParams, ComponentName name) {
-        this(loadUrlParams, null, null, null, name);
+        this(loadUrlParams, null, null, name);
         assert name != null;
     }
 
@@ -63,11 +58,6 @@ public class AsyncTabCreationParams implements AsyncTabParams {
         return mLoadUrlParams;
     }
 
-    @Override
-    public Intent getOriginalIntent() {
-        return mOriginalIntent;
-    }
-
     @Override
     public Integer getRequestId() {
         return mRequestId;
@@ -83,28 +73,24 @@ public class AsyncTabCreationParams implements AsyncTabParams {
         return mComponentName;
     }
 
-    private AsyncTabCreationParams(LoadUrlParams loadUrlParams, Intent originalIntent,
-            WebContents webContents, Integer requestId, ComponentName componentName) {
+    private AsyncTabCreationParams(LoadUrlParams loadUrlParams, WebContents webContents,
+            Integer requestId, ComponentName componentName) {
         assert loadUrlParams != null;
 
         // These parameters are set in very, very specific and exclusive circumstances.
-        if (originalIntent != null) {
-            assert webContents == null && requestId == null && componentName == null;
-        }
         if (webContents != null) {
-            assert originalIntent == null && requestId == null && componentName == null;
+            assert requestId == null && componentName == null;
         }
         if (requestId != null) {
-            assert originalIntent == null && webContents == null && componentName == null;
+            assert webContents == null && componentName == null;
         }
         if (componentName != null) {
-            assert originalIntent == null && webContents == null && requestId == null;
+            assert webContents == null && requestId == null;
         }
 
         mLoadUrlParams = loadUrlParams;
         mRequestId = requestId;
         mWebContents = webContents;
-        mOriginalIntent = originalIntent;
         mComponentName = componentName;
     }
 

chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerTest.java

@@ -295,7 +295,7 @@ public class TabWindowManagerTest {
         AsyncTabParamsManager.getAsyncTabParams().clear();
         final int asyncTabId = 123;
         final TabReparentingParams dummyParams =
-                new TabReparentingParams(new MockTab(0, false), null, null);
+                new TabReparentingParams(new MockTab(0, false), null);
         Assert.assertFalse(manager.tabExistsInAnySelector(asyncTabId));
         AsyncTabParamsManager.add(asyncTabId, dummyParams);
         try {
@@ -330,7 +330,7 @@ public class TabWindowManagerTest {
         AsyncTabParamsManager.getAsyncTabParams().clear();
         final int asyncTabId = 123;
         final TabReparentingParams dummyParams =
-                new TabReparentingParams(new MockTab(0, false), null, null);
+                new TabReparentingParams(new MockTab(0, false), null);
         Assert.assertNull(manager.getTabById(asyncTabId));
         AsyncTabParamsManager.add(asyncTabId, dummyParams);
         try {