From 6c7565ced67f0de1306d0bc09bbab383f47541bc Mon Sep 17 00:00:00 2001
From: Artem Samoilenko <artem@brave.com>
Date: Thu, 14 Aug 2025 09:59:03 -0400
Subject: [PATCH] [cr141][Android] Changes for AutocompleteMediator c-tor

Chromium changes:
https://chromium.googlesource.com/chromium/src/+/86f5cec0117fbbf339bec2e377847444c6cb256f

commit 86f5cec0117fbbf339bec2e377847444c6cb256f
Author: Tomasz Wiszkowski <ender@google.com>
Date:   Tue Aug 12 13:39:41 2025 -0700

    [Omnibox] Refactor large screen logic to the mediator

    This change moves the logic for determining the screen size from
    independent View implementations to AutocompleteMediator.

    This improves separation of concerns and makes the view layer simpler.

    Bug: N/A
    Change-Id: Ic387e6f2c881da8a3d125d86564650c375d11bcf
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6843320
    Commit-Queue: Tomasz Wiszkowski <ender@google.com>
    Auto-Submit: Tomasz Wiszkowski <ender@google.com>
    Reviewed-by: Jian Li <jianli@chromium.org>
    Cr-Commit-Position: refs/heads/main@{#1500392}
---
 .../suggestions/BraveAutocompleteMediator.java       |  6 ++++--
 .../org/chromium/chrome/browser/BytecodeTest.java    | 12 ++++++------
 .../suggestions/BraveAutocompleteCoordinator.java    |  9 ++-------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/android/java/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java b/android/java/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java
index e0edd97dbe9..13a84340147 100644
--- a/android/java/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java
+++ b/android/java/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java
@@ -70,7 +70,8 @@ class BraveAutocompleteMediator extends AutocompleteMediator
             ActivityLifecycleDispatcher lifecycleDispatcher,
             OmniboxSuggestionsDropdownEmbedder embedder,
             WindowAndroid windowAndroid,
-            DeferredIMEWindowInsetApplicationCallback deferredIMEWindowInsetApplicationCallback) {
+            DeferredIMEWindowInsetApplicationCallback deferredIMEWindowInsetApplicationCallback,
+            boolean forcePhoneStyleOmnibox) {
         super(
                 context,
                 delegate,
@@ -89,7 +90,8 @@ class BraveAutocompleteMediator extends AutocompleteMediator
                 lifecycleDispatcher,
                 embedder,
                 windowAndroid,
-                deferredIMEWindowInsetApplicationCallback);
+                deferredIMEWindowInsetApplicationCallback,
+                forcePhoneStyleOmnibox);
 
         mDelegate = delegate;
         mActivityTabSupplier = activityTabSupplier;
diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
index 7e146f4626d..8ce45ba6e96 100644
--- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
+++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
@@ -1045,11 +1045,10 @@ public class BytecodeTest {
                         Intent.class));
         Assert.assertTrue(
                 methodExists(
-                        "org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator",
+                        "org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator", // presubmit: ignore-long-line
                         "createViewProvider",
                         MethodModifier.REGULAR,
-                        ViewProvider.class,
-                        boolean.class));
+                        ViewProvider.class));
         Assert.assertTrue(
                 methodExists(
                         "org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator",
@@ -1485,8 +1484,8 @@ public class BytecodeTest {
                         DataSharingTabManager.class));
         Assert.assertTrue(
                 constructorsMatch(
-                        "org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator",
-                        "org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator",
+                        "org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator", // presubmit: ignore-long-line
+                        "org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator", // presubmit: ignore-long-line
                         Context.class,
                         AutocompleteDelegate.class,
                         UrlBarEditingTextStateProvider.class,
@@ -1504,7 +1503,8 @@ public class BytecodeTest {
                         ActivityLifecycleDispatcher.class,
                         OmniboxSuggestionsDropdownEmbedder.class,
                         WindowAndroid.class,
-                        DeferredIMEWindowInsetApplicationCallback.class));
+                        DeferredIMEWindowInsetApplicationCallback.class,
+                        boolean.class));
         Assert.assertTrue(
                 constructorsMatch(
                         "org/chromium/chrome/browser/multiwindow/MultiInstanceManagerApi31",
diff --git a/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteCoordinator.java b/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteCoordinator.java
index d420c0664fd..c6d02b20f63 100644
--- a/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteCoordinator.java
+++ b/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteCoordinator.java
@@ -22,16 +22,11 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class BraveAutocompleteCoordinator {
-    public ViewProvider<SuggestionListViewHolder> createViewProvider(
-            boolean forcePhoneStyleOmnibox) {
+    public ViewProvider<SuggestionListViewHolder> createViewProvider() {
         ViewProvider<SuggestionListViewHolder> provider =
                 (ViewProvider<SuggestionListViewHolder>)
                         BraveReflectionUtil.invokeMethod(
-                                AutocompleteCoordinator.class,
-                                this,
-                                "createViewProvider",
-                                boolean.class,
-                                forcePhoneStyleOmnibox);
+                                AutocompleteCoordinator.class, this, "createViewProvider");
 
         return new ViewProvider<SuggestionListViewHolder>() {
             private List<Callback<SuggestionListViewHolder>> mCallbacks = new ArrayList<>();