diff --git a/build/patches/00Disable-GSA-by-default.patch b/build/patches/00Disable-GSA-by-default.patch new file mode 100644 index 00000000..01daa804 --- /dev/null +++ b/build/patches/00Disable-GSA-by-default.patch @@ -0,0 +1,160 @@ +From: uazo +Date: Sun, 7 May 2023 14:01:56 +0000 +Subject: Disable GSA by default + +--- + .../org/chromium/chrome/browser/IntentHandler.java | 5 ----- + .../org/chromium/chrome/browser/share/LensUtils.java | 12 +----------- + chrome/browser/flags/android/chrome_feature_list.cc | 8 ++++---- + .../org/chromium/chrome/browser/gsa/GSAState.java | 11 +++++------ + 4 files changed, 10 insertions(+), 26 deletions(-) + +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java +@@ -43,7 +43,6 @@ import org.chromium.chrome.browser.document.ChromeLauncherActivity; + import org.chromium.chrome.browser.externalnav.IntentWithRequestMetadataHandler; + import org.chromium.chrome.browser.externalnav.IntentWithRequestMetadataHandler.RequestMetadata; + import org.chromium.chrome.browser.flags.ChromeFeatureList; +-import org.chromium.chrome.browser.gsa.GSAState; + import org.chromium.chrome.browser.offlinepages.OfflinePageUtils; + import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteControllerProvider; + import org.chromium.chrome.browser.profiles.Profile; +@@ -264,8 +263,6 @@ public class IntentHandler { + private static int sReferrerId; + private static String sPendingIncognitoUrl; + +- public static final String PACKAGE_GSA = GSAState.PACKAGE_NAME; +- + private static final String PACKAGE_GMAIL = "com.google.android.gm"; + private static final String PACKAGE_PLUS = "com.google.android.apps.plus"; + private static final String PACKAGE_HANGOUTS = "com.google.android.talk"; +@@ -497,8 +494,6 @@ public class IntentHandler { + return ExternalAppId.LINE; + } else if (packageName.equals(PACKAGE_WHATSAPP)) { + return ExternalAppId.WHATSAPP; +- } else if (packageName.equals(PACKAGE_GSA)) { +- return ExternalAppId.GSA; + } else if (packageName.equals(ContextUtils.getApplicationContext().getPackageName())) { + return ExternalAppId.CHROME; + } else if (packageName.startsWith(WEBAPK_PACKAGE_PREFIX)) { +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java +@@ -11,7 +11,6 @@ import android.text.TextUtils; + import org.chromium.chrome.R; + import org.chromium.chrome.browser.IntentHandler; + import org.chromium.chrome.browser.flags.ChromeFeatureList; +-import org.chromium.chrome.browser.gsa.GSAState; + import org.chromium.chrome.browser.lens.LensController; + import org.chromium.components.externalauth.ExternalAuthUtils; + +@@ -63,12 +62,7 @@ public class LensUtils { + if (context == null) { + return ""; + } +- String agsaVersion = GSAState.getInstance().getAgsaVersionName(); +- if (agsaVersion == null) { + return ""; +- } else { +- return agsaVersion; +- } + } + } + +@@ -120,11 +114,7 @@ public class LensUtils { + * @return Whether the package is valid. + */ + public static boolean isValidAgsaPackage(final ExternalAuthUtils externalAuthUtils) { +- if (sFakePassableLensEnvironmentForTesting) { +- return true; +- } +- +- return externalAuthUtils.isGoogleSigned(IntentHandler.PACKAGE_GSA); ++ return false; + } + + /** +diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc +--- a/chrome/browser/flags/android/chrome_feature_list.cc ++++ b/chrome/browser/flags/android/chrome_feature_list.cc +@@ -696,8 +696,8 @@ BASE_FEATURE(kContextMenuGoogleLensSearchOptimizations, + base::FEATURE_DISABLED_BY_DEFAULT); + + BASE_FEATURE(kContextMenuSearchWithGoogleLens, +- "ContextMenuSearchWithGoogleLens", +- base::FEATURE_ENABLED_BY_DEFAULT); ++ "ContextMenuSearchWithGoogleLens", // always disabled ++ base::FEATURE_DISABLED_BY_DEFAULT); // in bromite + + BASE_FEATURE(kContextMenuShopWithGoogleLens, + "ContextMenuShopWithGoogleLens", +@@ -768,8 +768,8 @@ BASE_FEATURE(kOfflineIndicatorV2, + base::FEATURE_ENABLED_BY_DEFAULT); + + BASE_FEATURE(kExperimentsForAgsa, +- "ExperimentsForAgsa", +- base::FEATURE_ENABLED_BY_DEFAULT); ++ "ExperimentsForAgsa", // disabled by default ++ base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite + + BASE_FEATURE(kExploreSites, "ExploreSites", base::FEATURE_DISABLED_BY_DEFAULT); + +diff --git a/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAState.java b/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAState.java +--- a/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAState.java ++++ b/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAState.java +@@ -33,8 +33,6 @@ import java.util.regex.Pattern; + * A class responsible for representing the current state of Chrome's integration with GSA. + */ + public class GSAState { +- public static final String PACKAGE_NAME = "com.google.android.googlequicksearchbox"; +- + /** Used to observe state changes in the class. */ + public interface Observer { + /** Called when the GSA account name is set. */ +@@ -74,7 +72,7 @@ public class GSAState { + /** + * Caches the result of a computation on whether GSA is available. + */ +- private Boolean mGsaAvailable; ++ private Boolean mGsaAvailable = false; + + /** + * The Google account email address being used by GSA according to the latest update we have +@@ -155,7 +153,7 @@ public class GSAState { + + /** Returns whether the GSA package is installed on device. */ + public boolean isGsaInstalled() { +- return PackageUtils.isPackageInstalled(PACKAGE_NAME); ++ return false; + } + + /** +@@ -178,6 +176,7 @@ public class GSAState { + */ + public boolean isAgsaVersionBelowMinimum( + String installedVersionName, String minimumVersionName) { ++ if ((true)) return true; + if (TextUtils.isEmpty(installedVersionName) || TextUtils.isEmpty(minimumVersionName)) { + return true; + } +@@ -209,7 +208,7 @@ public class GSAState { + * @return Whether the given intent can be handled by Agsa. + */ + public boolean canAgsaHandleIntent(@NonNull Intent intent) { +- if (!intent.getPackage().equals(PACKAGE_NAME)) return false; ++ if ((true)) return false; + + ComponentName activity = + intent.resolveActivity(ContextUtils.getApplicationContext().getPackageManager()); +@@ -223,7 +222,7 @@ public class GSAState { + * @return The version name of the Agsa package or null if it can't be found. + */ + public @Nullable String getAgsaVersionName() { +- PackageInfo packageInfo = PackageUtils.getPackageInfo(PACKAGE_NAME, 0); ++ PackageInfo packageInfo = null; + return packageInfo == null ? null : packageInfo.versionName; + } + +-- +2.25.1 diff --git a/build/patches/Disable-AGSA-by-default.patch b/build/patches/Disable-AGSA-by-default.patch deleted file mode 100644 index 2ece7172..00000000 --- a/build/patches/Disable-AGSA-by-default.patch +++ /dev/null @@ -1,306 +0,0 @@ -From: csagan5 <32685696+csagan5@users.noreply.github.com> -Date: Sun, 26 Sep 2021 11:17:53 +0200 -Subject: Disable AGSA by default - -License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html ---- - chrome/android/BUILD.gn | 3 --- - .../org/chromium/chrome/browser/AppHooks.java | 1 - - .../chrome/browser/IntentHandler.java | 5 ---- - .../chrome/browser/app/ChromeActivity.java | 27 ------------------- - .../ChromeContextMenuPopulator.java | 7 ----- - ...stomTabActivityClientConnectionKeeper.java | 9 ------- - .../init/ProcessInitializationHandler.java | 8 ------ - .../browser/ntp/search/SearchBoxMediator.java | 1 - - .../chrome/browser/share/LensUtils.java | 12 +-------- - .../flags/android/chrome_feature_list.cc | 4 +-- - chrome/browser/ui/android/omnibox/BUILD.gn | 2 -- - .../browser/omnibox/LocationBarMediator.java | 1 - - 12 files changed, 3 insertions(+), 77 deletions(-) - -diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn ---- a/chrome/android/BUILD.gn -+++ b/chrome/android/BUILD.gn -@@ -277,7 +277,6 @@ if (current_toolchain == default_toolchain) { - "//chrome/browser/flags:java", - "//chrome/browser/fullscreen/android:java", - "//chrome/browser/gesturenav/android:java", -- "//chrome/browser/gsa:java", - "//chrome/browser/history_clusters:java", - "//chrome/browser/history_clusters:java_resources", - "//chrome/browser/image_descriptions:java", -@@ -862,7 +861,6 @@ if (current_toolchain == default_toolchain) { - "//chrome/browser/flags:flags_junit_tests", - "//chrome/browser/flags:java", - "//chrome/browser/fullscreen/android:java", -- "//chrome/browser/gsa:java", - "//chrome/browser/history_clusters:java", - "//chrome/browser/image_descriptions:java", - "//chrome/browser/image_editor/public:java", -@@ -1399,7 +1397,6 @@ if (current_toolchain == default_toolchain) { - "//chrome/browser/first_run/android:java", - "//chrome/browser/flags:java", - "//chrome/browser/fullscreen/android:java", -- "//chrome/browser/gsa:java", - "//chrome/browser/history_clusters:java", - "//chrome/browser/image_descriptions:javatests", - "//chrome/browser/incognito:incognito_java_tests", -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java -@@ -15,7 +15,6 @@ import org.chromium.chrome.browser.directactions.DirectActionCoordinator; - import org.chromium.chrome.browser.feedback.FeedbackReporter; - import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncher; - import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl; --import org.chromium.chrome.browser.gsa.GSAHelper; - import org.chromium.chrome.browser.historyreport.AppIndexingReporter; - import org.chromium.chrome.browser.init.ChromeStartupDelegate; - import org.chromium.chrome.browser.init.ProcessInitializationHandler; -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java -@@ -43,7 +43,6 @@ import org.chromium.chrome.browser.document.ChromeLauncherActivity; - import org.chromium.chrome.browser.externalnav.IntentWithRequestMetadataHandler; - import org.chromium.chrome.browser.externalnav.IntentWithRequestMetadataHandler.RequestMetadata; - import org.chromium.chrome.browser.flags.ChromeFeatureList; --import org.chromium.chrome.browser.gsa.GSAState; - import org.chromium.chrome.browser.offlinepages.OfflinePageUtils; - import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteControllerProvider; - import org.chromium.chrome.browser.profiles.Profile; -@@ -264,8 +263,6 @@ public class IntentHandler { - private static int sReferrerId; - private static String sPendingIncognitoUrl; - -- public static final String PACKAGE_GSA = GSAState.PACKAGE_NAME; -- - private static final String PACKAGE_GMAIL = "com.google.android.gm"; - private static final String PACKAGE_PLUS = "com.google.android.apps.plus"; - private static final String PACKAGE_HANGOUTS = "com.google.android.talk"; -@@ -497,8 +494,6 @@ public class IntentHandler { - return ExternalAppId.LINE; - } else if (packageName.equals(PACKAGE_WHATSAPP)) { - return ExternalAppId.WHATSAPP; -- } else if (packageName.equals(PACKAGE_GSA)) { -- return ExternalAppId.GSA; - } else if (packageName.equals(ContextUtils.getApplicationContext().getPackageName())) { - return ExternalAppId.CHROME; - } else if (packageName.startsWith(WEBAPK_PACKAGE_PREFIX)) { -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -112,10 +112,6 @@ import org.chromium.chrome.browser.fullscreen.BrowserControlsManager; - import org.chromium.chrome.browser.fullscreen.BrowserControlsManagerSupplier; - import org.chromium.chrome.browser.fullscreen.FullscreenBackPressHandler; - import org.chromium.chrome.browser.fullscreen.FullscreenManager; --import org.chromium.chrome.browser.gsa.ContextReporter; --import org.chromium.chrome.browser.gsa.GSAAccountChangeListener; --import org.chromium.chrome.browser.gsa.GSAContextDisplaySelection; --import org.chromium.chrome.browser.gsa.GSAState; - import org.chromium.chrome.browser.history.HistoryManagerUtils; - import org.chromium.chrome.browser.init.AsyncInitializationActivity; - import org.chromium.chrome.browser.init.ProcessInitializationHandler; -@@ -374,8 +370,6 @@ public abstract class ChromeActivity - - private LaunchCauseMetrics mLaunchCauseMetrics; - -- private GSAAccountChangeListener mGSAAccountChangeListener; -- - // TODO(972867): Pull MenuOrKeyboardActionController out of ChromeActivity. - private List mMenuActionHandlers = - new ArrayList<>(); -@@ -1172,10 +1166,6 @@ public abstract class ChromeActivity - - @Override - public void onStopWithNative() { -- if (GSAState.getInstance().isGsaAvailable() && !SysUtils.isLowEndDevice()) { -- if (mGSAAccountChangeListener != null) mGSAAccountChangeListener.disconnect(); -- } -- - super.onStopWithNative(); - } - -@@ -1256,23 +1246,6 @@ public abstract class ChromeActivity - .recordUserFontPrefOnStartup(); - }); - -- // GSA connection is not needed on low-end devices because Icing is disabled. -- if (!SysUtils.isLowEndDevice()) { -- DeferredStartupHandler.getInstance().addDeferredTask(() -> { -- if (isActivityFinishingOrDestroyed()) return; -- if (!GSAState.getInstance().isGsaAvailable()) { -- ContextReporter.reportStatus(ContextReporter.STATUS_GSA_NOT_AVAILABLE); -- return; -- } -- -- if (mGSAAccountChangeListener == null) { -- mGSAAccountChangeListener = -- GSAAccountChangeListener.create(AppHooks.get().createGsaHelper()); -- } -- mGSAAccountChangeListener.connect(); -- }); -- } -- - DeferredStartupHandler.getInstance().addDeferredTask( - () -> { MemoryPurgeManager.getInstance().start(); }); - } -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java -@@ -36,7 +36,6 @@ import org.chromium.chrome.browser.contextmenu.ContextMenuCoordinator.ListItemTy - import org.chromium.chrome.browser.feature_engagement.TrackerFactory; - import org.chromium.chrome.browser.firstrun.FirstRunStatus; - import org.chromium.chrome.browser.flags.ChromeFeatureList; --import org.chromium.chrome.browser.gsa.GSAState; - import org.chromium.chrome.browser.lens.LensController; - import org.chromium.chrome.browser.lens.LensEntryPoint; - import org.chromium.chrome.browser.lens.LensIntentParams; -@@ -831,12 +830,6 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { - LensMetrics.LensSupportStatus.ACTIVITY_NOT_ACCESSIBLE); - return false; - } -- if (GSAState.getInstance().isAgsaVersionBelowMinimum( -- versionName, LensUtils.getMinimumAgsaVersionForLensSupport())) { -- LensMetrics.recordLensSupportStatus( -- LENS_SUPPORT_STATUS_HISTOGRAM_NAME, LensMetrics.LensSupportStatus.OUT_OF_DATE); -- return false; -- } - - if (LensUtils.isDeviceOsBelowMinimum()) { - LensMetrics.recordLensSupportStatus( -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityClientConnectionKeeper.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityClientConnectionKeeper.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityClientConnectionKeeper.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityClientConnectionKeeper.java -@@ -11,7 +11,6 @@ import org.chromium.base.metrics.RecordHistogram; - import org.chromium.chrome.browser.browserservices.intents.BrowserServicesIntentDataProvider; - import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabProvider; - import org.chromium.chrome.browser.dependency_injection.ActivityScope; --import org.chromium.chrome.browser.gsa.GSAState; - import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher; - import org.chromium.chrome.browser.lifecycle.StartStopWithNativeObserver; - import org.chromium.chrome.browser.tab.Tab; -@@ -95,13 +94,5 @@ public class CustomTabActivityClientConnectionKeeper implements StartStopWithNat - } - } - assert status >= 0; -- -- if (GSAState.isGsaPackageName(packageName)) { -- RecordHistogram.recordEnumeratedHistogram("CustomTabs.ConnectionStatusOnReturn.GSA", -- status, ConnectionStatus.NUM_ENTRIES); -- } else { -- RecordHistogram.recordEnumeratedHistogram("CustomTabs.ConnectionStatusOnReturn.NonGSA", -- status, ConnectionStatus.NUM_ENTRIES); -- } - } - } -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java -@@ -358,14 +358,6 @@ public class ProcessInitializationHandler { - } - }); - -- deferredStartupHandler.addDeferredTask(new Runnable() { -- @Override -- public void run() { -- // Starts syncing with GSA. -- AppHooks.get().createGsaHelper().startSync(); -- } -- }); -- - deferredStartupHandler.addDeferredTask(new Runnable() { - @Override - public void run() { -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java -@@ -13,7 +13,6 @@ import android.view.ViewGroup; - - import androidx.core.graphics.drawable.RoundedBitmapDrawable; - --import org.chromium.chrome.browser.gsa.GSAState; - import org.chromium.chrome.browser.lens.LensController; - import org.chromium.chrome.browser.lens.LensEntryPoint; - import org.chromium.chrome.browser.lens.LensIntentParams; -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java ---- a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java -@@ -11,7 +11,6 @@ import android.text.TextUtils; - import org.chromium.chrome.R; - import org.chromium.chrome.browser.IntentHandler; - import org.chromium.chrome.browser.flags.ChromeFeatureList; --import org.chromium.chrome.browser.gsa.GSAState; - import org.chromium.chrome.browser.lens.LensController; - import org.chromium.components.externalauth.ExternalAuthUtils; - -@@ -63,12 +62,7 @@ public class LensUtils { - if (context == null) { - return ""; - } -- String agsaVersion = GSAState.getInstance().getAgsaVersionName(); -- if (agsaVersion == null) { - return ""; -- } else { -- return agsaVersion; -- } - } - } - -@@ -120,11 +114,7 @@ public class LensUtils { - * @return Whether the package is valid. - */ - public static boolean isValidAgsaPackage(final ExternalAuthUtils externalAuthUtils) { -- if (sFakePassableLensEnvironmentForTesting) { -- return true; -- } -- -- return externalAuthUtils.isGoogleSigned(IntentHandler.PACKAGE_GSA); -+ return false; - } - - /** -diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc ---- a/chrome/browser/flags/android/chrome_feature_list.cc -+++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -734,8 +734,8 @@ BASE_FEATURE(kDownloadHomeForExternalApp, - "DownloadHomeForExternalApp", - base::FEATURE_ENABLED_BY_DEFAULT); - BASE_FEATURE(kExperimentsForAgsa, -- "ExperimentsForAgsa", -- base::FEATURE_ENABLED_BY_DEFAULT); -+ "ExperimentsForAgsa", // disabled by default -+ base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite - - BASE_FEATURE(kExploreSites, "ExploreSites", base::FEATURE_DISABLED_BY_DEFAULT); - -diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/android/omnibox/BUILD.gn ---- a/chrome/browser/ui/android/omnibox/BUILD.gn -+++ b/chrome/browser/ui/android/omnibox/BUILD.gn -@@ -149,7 +149,6 @@ android_library("java") { - "//chrome/browser/device:java", - "//chrome/browser/feature_engagement:java", - "//chrome/browser/flags:java", -- "//chrome/browser/gsa:java", - "//chrome/browser/history_clusters:java", - "//chrome/browser/language/android:java", - "//chrome/browser/lens:java", -@@ -447,7 +446,6 @@ robolectric_library("junit") { - "//chrome/android:base_module_java", - "//chrome/browser/device:java", - "//chrome/browser/flags:java", -- "//chrome/browser/gsa:java", - "//chrome/browser/lens:java", - "//chrome/browser/locale:java", - "//chrome/browser/preferences:java", -diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java ---- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java -+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java -@@ -39,7 +39,6 @@ import org.chromium.chrome.browser.back_press.BackPressManager; - import org.chromium.chrome.browser.device.DeviceClassManager; - import org.chromium.chrome.browser.flags.ChromeFeatureList; - import org.chromium.chrome.browser.flags.ChromeSwitches; --import org.chromium.chrome.browser.gsa.GSAState; - import org.chromium.chrome.browser.lens.LensController; - import org.chromium.chrome.browser.lens.LensEntryPoint; - import org.chromium.chrome.browser.lens.LensIntentParams; --- -2.25.1