Remove url_param_filter on android

This CL is mostly a revert of https://crrev.com/c/3570442. Note that the
tab creation type enum will be left as-is for now, with use of the old
enum type potentially cleaned up in the future.

Bug: 1380927
Change-Id: I5a62851ca58435f2d54c56ed5b6b08522242fc16
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4000124
Commit-Queue: Matt Reichhoff <mreichhoff@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1067654}

chrome/android/chrome_test_java_sources.gni

@@ -538,7 +538,6 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/ui/MediaCaptureOverlayControllerTest.java",
   "javatests/src/org/chromium/chrome/browser/ui/system/StatusBarColorControllerTest.java",
   "javatests/src/org/chromium/chrome/browser/undo_tab_close_snackbar/UndoBarControllerTest.java",
-  "javatests/src/org/chromium/chrome/browser/url_param_filter/UrlParamFilterTest.java",
   "javatests/src/org/chromium/chrome/browser/usage_stats/TabSuspensionTest.java",
   "javatests/src/org/chromium/chrome/browser/video/FullscreenVideoTest.java",
   "javatests/src/org/chromium/chrome/browser/video/VideoTest.java",

chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java

@@ -72,7 +72,6 @@
 import org.chromium.ui.modelutil.MVCListAdapter.ModelList;
 import org.chromium.ui.modelutil.PropertyModel;
 import org.chromium.url.GURL;
-import org.chromium.url.Origin;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -90,7 +89,6 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
     private final Supplier<ShareDelegate> mShareDelegateSupplier;
     private final ExternalAuthUtils mExternalAuthUtils;
     private final ContextMenuParams mParams;
-    private final @Nullable Origin mInitiatingOrigin;
     private @Nullable UkmRecorder.Bridge mUkmRecorderBridge;
     private ContextMenuNativeDelegate mNativeDelegate;
     private static final String LENS_SEARCH_MENU_ITEM_KEY = "searchWithGoogleLensMenuItem";
@@ -326,13 +324,6 @@ public ChromeContextMenuPopulator(ContextMenuItemDelegate itemDelegate,
         mExternalAuthUtils = externalAuthUtils;
         mContext = context;
         mParams = params;
-        if (itemDelegate.getWebContents() != null
-                && itemDelegate.getWebContents().getFocusedFrame() != null) {
-            mInitiatingOrigin =
-                    itemDelegate.getWebContents().getFocusedFrame().getLastCommittedOrigin();
-        } else {
-            mInitiatingOrigin = null;
-        }
         mNativeDelegate = nativeDelegate;
     }
 
@@ -608,7 +599,7 @@ public boolean onItemSelected(int itemId) {
             mItemDelegate.onOpenInNewTabInGroup(mParams.getUrl(), mParams.getReferrer());
         } else if (itemId == R.id.contextmenu_open_in_incognito_tab) {
             recordContextMenuSelection(ContextMenuUma.Action.OPEN_IN_INCOGNITO_TAB);
-            mItemDelegate.onOpenInNewIncognitoTab(mParams.getUrl(), mInitiatingOrigin);
+            mItemDelegate.onOpenInNewIncognitoTab(mParams.getUrl());
         } else if (itemId == R.id.contextmenu_open_in_other_window) {
             recordContextMenuSelection(ContextMenuUma.Action.OPEN_IN_OTHER_WINDOW);
             mItemDelegate.onOpenInOtherWindow(mParams.getUrl(), mParams.getReferrer());

chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java

@@ -45,7 +45,6 @@
 import org.chromium.ui.base.Clipboard;
 import org.chromium.ui.base.PageTransition;
 import org.chromium.url.GURL;
-import org.chromium.url.Origin;
 
 /**
  * A default {@link ContextMenuItemDelegate} that supports the context menu functionality in Tab.
@@ -223,12 +222,10 @@ public void onOpenInNewTabInGroup(GURL url, Referrer referrer) {
     }
 
     @Override
-    public void onOpenInNewIncognitoTab(GURL url, Origin initiatorOrigin) {
+    public void onOpenInNewIncognitoTab(GURL url) {
         RecordUserAction.record("MobileNewTabOpened");
-        LoadUrlParams loadUrlParams = new LoadUrlParams(url.getSpec());
-        loadUrlParams.setInitiatorOrigin(initiatorOrigin);
-        mTabModelSelector.openNewTab(
-                loadUrlParams, TabLaunchType.FROM_LONGPRESS_INCOGNITO, mTab, true);
+        mTabModelSelector.openNewTab(new LoadUrlParams(url.getSpec()),
+                TabLaunchType.FROM_LONGPRESS_INCOGNITO, mTab, true);
     }
 
     @Override

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

@@ -37,7 +37,6 @@
 import org.chromium.chrome.test.util.browser.contextmenu.ContextMenuUtils;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.url.GURL;
 
 import java.util.concurrent.TimeoutException;
 import java.util.regex.Pattern;
@@ -139,9 +138,6 @@ public void testOpenInIncognitoTabNoReferrer() throws TimeoutException {
                 R.id.contextmenu_open_in_incognito_tab);
 
         Assert.assertNotNull(sOpenNewTabLoadUrlParams);
-        Assert.assertNotNull(sOpenNewTabLoadUrlParams.getInitiatorOrigin());
-        Assert.assertEquals(new GURL(sActivityTestRule.getTestServer().getURL(HTML_PATH)).getHost(),
-                sOpenNewTabLoadUrlParams.getInitiatorOrigin().getHost());
         Assert.assertNull(sOpenNewTabLoadUrlParams.getReferrer());
     }
 

chrome/browser/BUILD.gn

@@ -2869,8 +2869,6 @@ static_library("browser") {
       "android/thin_webview/chrome_thin_webview_initializer.h",
       "android/trusted_cdn.cc",
       "android/trusted_cdn.h",
-      "android/url_param_filter/cross_otr_observer_android.cc",
-      "android/url_param_filter/cross_otr_observer_android.h",
       "android/usage_stats/notification_suspender.cc",
       "android/usage_stats/usage_stats_bridge.cc",
       "android/usage_stats/usage_stats_bridge.h",

chrome/browser/android/tab_android.cc

@@ -26,7 +26,6 @@
 #include "chrome/browser/android/metrics/uma_utils.h"
 #include "chrome/browser/android/tab_printer.h"
 #include "chrome/browser/android/tab_web_contents_delegate_android.h"
-#include "chrome/browser/android/url_param_filter/cross_otr_observer_android.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/notifications/notification_permission_context.h"
@@ -323,10 +322,6 @@ void TabAndroid::InitWebContents(
       resource_coordinator::ResourceCoordinatorTabHelper::IsLoaded(
           web_contents_.get()));
 
-  url_param_filter::MaybeCreateCrossOtrObserverForTabLaunchType(
-      web_contents_.get(),
-      static_cast<TabModel::TabLaunchType>(GetLaunchType()));
-
   SetWindowSessionID(session_window_id_);
 
   ContextMenuHelper::FromWebContents(web_contents())