[ToolbarMVC] Manage profile and OmniboxPrerender in LBMediator

As of this change, LocationBarLayout does not track the active
profile or manage an OmniboxPrerender instance. This logic is
moved to LocationBarMediator, with an associated unit test.
This entails moving most of the implementation of
onSuggestionsChanged() to LocationBarMediator as well.

Bug: 1147581
Change-Id: I3cbb921074c7db893658388405ef8bdb514fd83a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2553040
Commit-Queue: Patrick Noland <pnoland@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Reviewed-by: Filip Gorski <fgorski@chromium.org>
Cr-Commit-Position: refs/heads/master@{#833900}

chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java

@@ -6,9 +6,11 @@ package org.chromium.chrome.browser.omnibox;
 
 import android.view.ActionMode;
 import android.view.View;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.view.ViewCompat;
+
 import org.chromium.base.CallbackController;
 import org.chromium.base.supplier.ObservableSupplier;
 import org.chromium.base.supplier.OneshotSupplierImpl;
@@ -26,6 +28,7 @@ import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator;
 import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsDropdownEmbedder;
 import org.chromium.chrome.browser.omnibox.voice.AssistantVoiceSearchService;
 import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
+import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.share.ShareDelegate;
 import org.chromium.chrome.browser.tabmodel.IncognitoStateProvider;
@@ -115,8 +118,10 @@ public final class LocationBarCoordinator
         mUrlBar = mLocationBarLayout.findViewById(R.id.url_bar);
         OneshotSupplierImpl<AssistantVoiceSearchService> assistantVoiceSearchSupplier =
                 new OneshotSupplierImpl();
-        mLocationBarMediator = new LocationBarMediator(
-                mLocationBarLayout, locationBarDataProvider, assistantVoiceSearchSupplier);
+
+        mLocationBarMediator = new LocationBarMediator(mLocationBarLayout, locationBarDataProvider,
+                assistantVoiceSearchSupplier, profileObservableSupplier,
+                PrivacyPreferencesManagerImpl.getInstance());
         mUrlCoordinator =
                 new UrlBarCoordinator((UrlBar) mUrlBar, windowDelegate, actionModeCallback,
                         mCallbackController.makeCancelable(mLocationBarMediator::onUrlFocusChange),
@@ -128,8 +133,10 @@ public final class LocationBarCoordinator
         StatusView statusView = mLocationBarLayout.findViewById(R.id.location_bar_status);
         mStatusCoordinator = new StatusCoordinator(isTablet(), statusView, mUrlCoordinator,
                 incognitoStateProvider, modalDialogManagerSupplier, locationBarDataProvider);
-        mLocationBarMediator.setCoordinators(mStatusCoordinator, mAutocompleteCoordinator);
+        mLocationBarMediator.setCoordinators(
+                mUrlCoordinator, mAutocompleteCoordinator, mStatusCoordinator);
         mUrlBar.setOnKeyListener(mLocationBarMediator);
+
         mUrlCoordinator.addUrlTextChangeListener(mAutocompleteCoordinator);
 
         // The LocationBar's direction is tied to the UrlBar's text direction. Icons inside the
@@ -142,9 +149,8 @@ public final class LocationBarCoordinator
 
         mLocationBarLayout.addUrlFocusChangeListener(mAutocompleteCoordinator);
         mLocationBarLayout.initialize(mAutocompleteCoordinator, mUrlCoordinator, mStatusCoordinator,
-                locationBarDataProvider, profileObservableSupplier, windowDelegate, windowAndroid,
-                overrideUrlLoadingDelegate, mLocationBarMediator.getVoiceRecognitionHandler(),
-                assistantVoiceSearchSupplier);
+                locationBarDataProvider, windowDelegate, windowAndroid, overrideUrlLoadingDelegate,
+                mLocationBarMediator.getVoiceRecognitionHandler(), assistantVoiceSearchSupplier);
     }
 
     @Override

chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java

@@ -30,17 +30,12 @@ import androidx.annotation.VisibleForTesting;
 import androidx.core.view.MarginLayoutParamsCompat;
 
 import org.chromium.base.ApiCompatibilityUtils;
-import org.chromium.base.Callback;
-import org.chromium.base.CallbackController;
-import org.chromium.base.CommandLine;
 import org.chromium.base.ObserverList;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.RecordUserAction;
-import org.chromium.base.supplier.ObservableSupplier;
 import org.chromium.base.supplier.OneshotSupplier;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.WindowDelegate;
-import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.browser.locale.LocaleManager;
 import org.chromium.chrome.browser.ntp.NewTabPageUma;
 import org.chromium.chrome.browser.omnibox.UrlBar.ScrollType;
@@ -51,8 +46,6 @@ import org.chromium.chrome.browser.omnibox.status.StatusView;
 import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator;
 import org.chromium.chrome.browser.omnibox.voice.AssistantVoiceSearchService;
 import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
-import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl;
-import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.util.ChromeAccessibilityUtil;
@@ -110,8 +103,6 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener {
     private boolean mUrlFocusedWithoutAnimations;
     protected boolean mVoiceSearchEnabled;
 
-    private OmniboxPrerender mOmniboxPrerender;
-
     protected float mUrlFocusChangeFraction;
     protected LinearLayout mUrlActionContainer;
 
@@ -122,9 +113,6 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener {
     private OneshotSupplier<AssistantVoiceSearchService> mAssistantVoiceSearchServiceSupplier;
     private Runnable mKeyboardResizeModeTask;
     private Runnable mKeyboardHideTask;
-    private ObservableSupplier<Profile> mProfileSupplier;
-    private Callback<Profile> mProfileSupplierObserver;
-    private CallbackController mCallbackController = new CallbackController();
     private TemplateUrlServiceObserver mTemplateUrlObserver;
     private OverrideUrlLoadingDelegate mOverrideUrlLoadingDelegate;
 
@@ -157,17 +145,6 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener {
             mAutocompleteCoordinator = null;
         }
 
-        if (mCallbackController != null) {
-            mCallbackController.destroy();
-            mCallbackController = null;
-        }
-
-        if (mProfileSupplier != null) {
-            mProfileSupplier.removeObserver(mProfileSupplierObserver);
-            mProfileSupplier = null;
-            mProfileSupplierObserver = null;
-        }
-
         if (mTemplateUrlObserver != null) {
             TemplateUrlServiceFactory.get().removeObserver(mTemplateUrlObserver);
             mTemplateUrlObserver = null;
@@ -224,7 +201,6 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener {
      * @param urlCoordinator The coordinator for interacting with the url bar.
      * @param statusCoordinator The coordinator for interacting with the status icon.
      * @param locationBarDataProvider Provider of LocationBar data, e.g. url and title.
-     * @param profileSupplier Supplier of the profile for the currently active TabModel.
      * @param windowDelegate {@link WindowDelegate} that will provide {@link Window} related info.
      * @param windowAndroid {@link WindowAndroid} that is used by the owning {@link Activity}.
      */
@@ -232,7 +208,6 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener {
     public void initialize(@NonNull AutocompleteCoordinator autocompleteCoordinator,
             @NonNull UrlBarCoordinator urlCoordinator, @NonNull StatusCoordinator statusCoordinator,
             @NonNull LocationBarDataProvider locationBarDataProvider,
-            @NonNull ObservableSupplier<Profile> profileSupplier,
             @NonNull WindowDelegate windowDelegate, @NonNull WindowAndroid windowAndroid,
             @NonNull OverrideUrlLoadingDelegate overrideUrlLoadingDelegate,
             @NonNull VoiceRecognitionHandler voiceRecognitionHandler,
@@ -247,12 +222,6 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener {
         mVoiceRecognitionHandler = voiceRecognitionHandler;
         mAssistantVoiceSearchServiceSupplier = assistantVoiceSearchSupplier;
 
-        assert profileSupplier != null;
-        assert mProfileSupplier == null;
-        mProfileSupplier = profileSupplier;
-        mProfileSupplierObserver = mCallbackController.makeCancelable(this::setProfile);
-        mProfileSupplier.addObserver(mProfileSupplierObserver);
-
         updateButtonVisibility();
         updateShouldAnimateIconChanges();
     }
@@ -263,8 +232,7 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener {
     }
 
     /**
-     *  Signals to LocationBarLayout that's it safe to call code that requires native to be loaded,
-     * e.g. OmniboxPrerender.
+     *  Signals to LocationBarLayout that's it safe to call code that requires native to be loaded.
      */
     public void onFinishNativeInitialization() {
         TemplateUrlServiceFactory.get().runWhenLoaded(this::registerTemplateUrlObserver);
@@ -274,8 +242,6 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener {
         mDeleteButton.setOnClickListener(this);
         mMicButton.setOnClickListener(this);
 
-        mOmniboxPrerender = new OmniboxPrerender();
-
         for (Runnable deferredRunnable : mDeferredNativeRunnables) {
             post(deferredRunnable);
         }
@@ -284,8 +250,6 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener {
         onPrimaryColorChanged();
 
         updateMicButtonVisibility();
-
-        setProfile(mProfileSupplier.get());
     }
 
     /** Initiates a prefetch of autocomplete suggestions. */
@@ -351,26 +315,12 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener {
 
     /* package */ void onSuggestionsHidden() {}
 
-    /* package */ void onSuggestionsChanged(String autocompleteText) {
-        String userText = mUrlCoordinator.getTextWithoutAutocomplete();
-        if (mUrlCoordinator.shouldAutocomplete()) {
-            mUrlCoordinator.setAutocompleteText(userText, autocompleteText);
-        }
-
+    /* package */ void onSuggestionsChanged() {
         // Handle the case where suggestions (in particular zero suggest) are received without the
         // URL focusing happening.
         if (mUrlFocusedWithoutAnimations && mUrlHasFocus) {
             handleUrlFocusAnimation(mUrlHasFocus);
         }
-
-        if (mNativeInitialized
-                && !CommandLine.getInstance().hasSwitch(ChromeSwitches.DISABLE_INSTANT)
-                && PrivacyPreferencesManagerImpl.getInstance().shouldPrerender()
-                && mLocationBarDataProvider.hasTab()) {
-            mOmniboxPrerender.prerenderMaybe(userText, getOriginalUrl(),
-                    mAutocompleteCoordinator.getCurrentNativeAutocompleteResult(),
-                    mLocationBarDataProvider.getProfile(), mLocationBarDataProvider.getTab());
-        }
     }
 
     @Override
@@ -643,10 +593,6 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener {
         setUrlBarText(mLocationBarDataProvider.getUrlBarData(), UrlBar.ScrollType.SCROLL_TO_TLD,
                 SelectionState.SELECT_ALL);
         if (!mLocationBarDataProvider.hasTab()) return;
-
-        // Profile may be null if switching to a tab that has not yet been initialized.
-        Profile profile = mLocationBarDataProvider.getProfile();
-        if (profile != null && mOmniboxPrerender != null) mOmniboxPrerender.clear(profile);
     }
 
     /* package */ void setOmniboxEditingText(String text) {
@@ -789,20 +735,6 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener {
         mStatusCoordinator.setShouldAnimateIconChanges(shouldAnimate);
     }
 
-    /**
-     * Updates the profile used by this LocationBar, for, e.g. determining incognito status or
-     * generating autocomplete suggestions..
-     * @param profile The profile to be used.
-     */
-    private void setProfile(Profile profile) {
-        if (profile == null || !mNativeInitialized) return;
-        mAutocompleteCoordinator.setAutocompleteProfile(profile);
-        mOmniboxPrerender.initializeForProfile(profile);
-
-        setShowIconsWhenUrlFocused(
-                SearchEngineLogoUtils.shouldShowSearchEngineLogo(profile.isOffTheRecord()));
-    }
-
     /** Focuses the current page. */
     private void focusCurrentTab() {
         if (mLocationBarDataProvider.hasTab()) {

chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java

@@ -13,8 +13,12 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.chromium.base.CallbackController;
+import org.chromium.base.CommandLine;
+import org.chromium.base.supplier.ObservableSupplier;
 import org.chromium.base.supplier.OneshotSupplierImpl;
 import org.chromium.chrome.browser.AppHooks;
+import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.browser.gsa.GSAState;
 import org.chromium.chrome.browser.native_page.NativePageFactory;
 import org.chromium.chrome.browser.ntp.FakeboxDelegate;
@@ -26,6 +30,8 @@ import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteDelegate;
 import org.chromium.chrome.browser.omnibox.voice.AssistantVoiceSearchService;
 import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
+import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl;
+import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
 import org.chromium.chrome.browser.util.KeyNavigationUtil;
 import org.chromium.ui.base.WindowAndroid;
@@ -47,16 +53,42 @@ class LocationBarMediator implements LocationBarDataProvider.Observer, Autocompl
     private final OneshotSupplierImpl<AssistantVoiceSearchService> mAssistantVoiceSearchSupplier;
     private StatusCoordinator mStatusCoordinator;
     private AutocompleteCoordinator mAutocompleteCoordinator;
+    private OmniboxPrerender mOmniboxPrerender;
+    private UrlBarCoordinator mUrlCoordinator;
+    private ObservableSupplier<Profile> mProfileSupplier;
+    private PrivacyPreferencesManagerImpl mPrivacyPreferencesManager;
+    private CallbackController mCallbackController = new CallbackController();
+
+    private boolean mNativeInitialized;
 
     /*package */ LocationBarMediator(@NonNull LocationBarLayout locationBarLayout,
             @NonNull LocationBarDataProvider locationBarDataProvider,
-            @NonNull OneshotSupplierImpl<AssistantVoiceSearchService>
-                    assistantVoiceSearchSupplier) {
+            @NonNull OneshotSupplierImpl<AssistantVoiceSearchService> assistantVoiceSearchSupplier,
+            @NonNull ObservableSupplier<Profile> profileSupplier,
+            @NonNull PrivacyPreferencesManagerImpl privacyPreferencesManager) {
         mLocationBarLayout = locationBarLayout;
         mLocationBarDataProvider = locationBarDataProvider;
         mLocationBarDataProvider.addObserver(this);
         mAssistantVoiceSearchSupplier = assistantVoiceSearchSupplier;
         mVoiceRecognitionHandler = new VoiceRecognitionHandler(this, mAssistantVoiceSearchSupplier);
+        mProfileSupplier = profileSupplier;
+        mProfileSupplier.addObserver(mCallbackController.makeCancelable(this::setProfile));
+        mPrivacyPreferencesManager = privacyPreferencesManager;
+    }
+
+    /**
+     * Sets coordinators post-construction; they can't be set at construction time since
+     * LocationBarMediator is a delegate for them, so is constructed beforehand.
+     *
+     * @param urlCoordinator Coordinator for the url bar.
+     * @param autocompleteCoordinator Coordinator for the autocomplete component.
+     * @param statusCoordinator Coordinator for the status icon.
+     */
+    /*package */ void setCoordinators(UrlBarCoordinator urlCoordinator,
+            AutocompleteCoordinator autocompleteCoordinator, StatusCoordinator statusCoordinator) {
+        mUrlCoordinator = urlCoordinator;
+        mAutocompleteCoordinator = autocompleteCoordinator;
+        mStatusCoordinator = statusCoordinator;
     }
 
     /*package */ void destroy() {
@@ -66,6 +98,8 @@ class LocationBarMediator implements LocationBarDataProvider.Observer, Autocompl
         }
         mStatusCoordinator = null;
         mAutocompleteCoordinator = null;
+        mUrlCoordinator = null;
+        mPrivacyPreferencesManager = null;
     }
 
     /*package */ void onUrlFocusChange(boolean hasFocus) {
@@ -73,12 +107,15 @@ class LocationBarMediator implements LocationBarDataProvider.Observer, Autocompl
     }
 
     /*package */ void onFinishNativeInitialization() {
+        mNativeInitialized = true;
+        mOmniboxPrerender = new OmniboxPrerender();
         Context context = mLocationBarLayout.getContext();
         mAssistantVoiceSearchService = new AssistantVoiceSearchService(context,
                 AppHooks.get().getExternalAuthUtils(), TemplateUrlServiceFactory.get(),
                 GSAState.getInstance(context), this, SharedPreferencesManager.getInstance());
         mAssistantVoiceSearchSupplier.set(mAssistantVoiceSearchService);
         mLocationBarLayout.onFinishNativeInitialization();
+        setProfile(mProfileSupplier.get());
     }
 
     /*package */ void setUrlFocusChangeFraction(float fraction) {
@@ -95,17 +132,15 @@ class LocationBarMediator implements LocationBarDataProvider.Observer, Autocompl
         mLocationBarLayout.setVoiceRecognitionHandlerForTesting(voiceRecognitionHandler);
     }
 
-    /**
-     * Sets coordinators post-construction; they can't be set at construction time since
-     * LocationBarMediator is a delegate for them, so is constructed beforehand.
-     *
-     * @param statusCoordinator
-     * @param autocompleteCoordinator
-     */
-    /* package */ void setCoordinators(@NonNull StatusCoordinator statusCoordinator,
-            @NonNull AutocompleteCoordinator autocompleteCoordinator) {
-        mStatusCoordinator = statusCoordinator;
-        mAutocompleteCoordinator = autocompleteCoordinator;
+    // Private methods
+
+    private void setProfile(Profile profile) {
+        if (profile == null || !mNativeInitialized) return;
+        mAutocompleteCoordinator.setAutocompleteProfile(profile);
+        mOmniboxPrerender.initializeForProfile(profile);
+
+        mLocationBarLayout.setShowIconsWhenUrlFocused(
+                SearchEngineLogoUtils.shouldShowSearchEngineLogo(profile.isOffTheRecord()));
     }
 
     /*package */ void updateVisualsForState() {
@@ -152,6 +187,9 @@ class LocationBarMediator implements LocationBarDataProvider.Observer, Autocompl
     @Override
     public void onUrlChanged() {
         mLocationBarLayout.setUrl(mLocationBarDataProvider.getCurrentUrl());
+        // Profile may be null if switching to a tab that has not yet been initialized.
+        Profile profile = mProfileSupplier.get();
+        if (profile != null && mOmniboxPrerender != null) mOmniboxPrerender.clear(profile);
     }
 
     @Override
@@ -210,10 +248,21 @@ class LocationBarMediator implements LocationBarDataProvider.Observer, Autocompl
 
     @Override
     public void onSuggestionsChanged(String autocompleteText, boolean defaultMatchIsSearch) {
-        mLocationBarLayout.onSuggestionsChanged(autocompleteText);
-        // TODO (https://crbug.com/1152501): Refactor the LBM/LBC relationship such that LBM doesn't
-        // need to communicate with other coordinators like this.
         mStatusCoordinator.onDefaultMatchClassified(defaultMatchIsSearch);
+        String userText = mUrlCoordinator.getTextWithoutAutocomplete();
+        if (mUrlCoordinator.shouldAutocomplete()) {
+            mUrlCoordinator.setAutocompleteText(userText, autocompleteText);
+        }
+
+        mLocationBarLayout.onSuggestionsChanged();
+        if (mNativeInitialized
+                && !CommandLine.getInstance().hasSwitch(ChromeSwitches.DISABLE_INSTANT)
+                && mPrivacyPreferencesManager.shouldPrerender()
+                && mLocationBarDataProvider.hasTab()) {
+            mOmniboxPrerender.prerenderMaybe(userText, mLocationBarLayout.getOriginalUrl(),
+                    mAutocompleteCoordinator.getCurrentNativeAutocompleteResult(),
+                    mProfileSupplier.get(), mLocationBarDataProvider.getTab());
+        }
     }
 
     @Override

chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarTablet.java

@@ -16,7 +16,6 @@ import android.view.View;
 
 import androidx.annotation.NonNull;
 
-import org.chromium.base.supplier.ObservableSupplier;
 import org.chromium.base.supplier.OneshotSupplier;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.WindowDelegate;
@@ -25,7 +24,6 @@ import org.chromium.chrome.browser.omnibox.status.StatusCoordinator;
 import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator;
 import org.chromium.chrome.browser.omnibox.voice.AssistantVoiceSearchService;
 import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
-import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.toolbar.top.ToolbarTablet;
 import org.chromium.components.browser_ui.widget.animation.CancelAwareAnimatorListener;
@@ -120,14 +118,13 @@ class LocationBarTablet extends LocationBarLayout {
     public void initialize(@NonNull AutocompleteCoordinator autocompleteCoordinator,
             @NonNull UrlBarCoordinator urlCoordinator, @NonNull StatusCoordinator statusCoordinator,
             @NonNull LocationBarDataProvider locationBarDataProvider,
-            @NonNull ObservableSupplier<Profile> profileSupplier,
             @NonNull WindowDelegate windowDelegate, @NonNull WindowAndroid windowAndroid,
             @NonNull OverrideUrlLoadingDelegate overrideUrlLoadingDelegate,
             @NonNull VoiceRecognitionHandler voiceRecognitionHandler,
             @NonNull OneshotSupplier<AssistantVoiceSearchService> assistantVoiceSearchSupplier) {
         super.initialize(autocompleteCoordinator, urlCoordinator, statusCoordinator,
-                locationBarDataProvider, profileSupplier, windowDelegate, windowAndroid,
-                overrideUrlLoadingDelegate, voiceRecognitionHandler, assistantVoiceSearchSupplier);
+                locationBarDataProvider, windowDelegate, windowAndroid, overrideUrlLoadingDelegate,
+                voiceRecognitionHandler, assistantVoiceSearchSupplier);
         mStatusCoordinator.setShowIconsWhenUrlFocused(true);
         if (SearchEngineLogoUtils.shouldShowSearchEngineLogo(
                     mLocationBarDataProvider.isIncognito())) {
@@ -244,8 +241,8 @@ class LocationBarTablet extends LocationBarLayout {
     }
 
     @Override
-    void onSuggestionsChanged(String autocompleteText) {
-        super.onSuggestionsChanged(autocompleteText);
+    void onSuggestionsChanged() {
+        super.onSuggestionsChanged();
         mStatusCoordinator.setFirstSuggestionIsSearchType(
                 mAutocompleteCoordinator.getSuggestionCount() > 0
                 && mAutocompleteCoordinator.getSuggestionAt(0).isSearchSuggestion());

chrome/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxPrerender.java

@@ -50,8 +50,8 @@ public class OmniboxPrerender {
     }
 
     /**
-     * Potentailly invokes a pre-render or pre-connect given the url typed into the omnibox and
-     * a corresponding autocomplete result. This should be invoked everytime the omnibox changes
+     * Potentially invokes a pre-render or pre-connect given the url typed into the omnibox and
+     * a corresponding autocomplete result. This should be invoked every time the omnibox changes
      * (e.g. As the user types characters this method should be invoked at least once per character)
      *
      * @param url url in the omnibox.

chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityLocationBarLayout.java

@@ -9,12 +9,9 @@ import android.os.Handler;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
-
-import org.chromium.base.supplier.ObservableSupplier;
 import org.chromium.base.supplier.OneshotSupplier;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.WindowDelegate;
@@ -30,7 +27,6 @@ import org.chromium.chrome.browser.omnibox.status.StatusCoordinator;
 import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator;
 import org.chromium.chrome.browser.omnibox.voice.AssistantVoiceSearchService;
 import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
-import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.toolbar.top.ToolbarPhone;
 import org.chromium.ui.base.WindowAndroid;
 
@@ -67,16 +63,14 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout {
     public void initialize(@NonNull AutocompleteCoordinator autocompleteCoordinator,
             @NonNull UrlBarCoordinator urlCoordinator, @NonNull StatusCoordinator statusCoordinator,
             @NonNull LocationBarDataProvider locationBarDataProvider,
-            @NonNull ObservableSupplier<Profile> profileSupplier,
             @NonNull WindowDelegate windowDelegate, @NonNull WindowAndroid windowAndroid,
             @NonNull OverrideUrlLoadingDelegate overrideUrlLoadingDelegate,
             @NonNull VoiceRecognitionHandler voiceRecognitionHandler,
             @NonNull OneshotSupplier<AssistantVoiceSearchService>
                     assistantVoiceSearchServiceSupplier) {
         super.initialize(autocompleteCoordinator, urlCoordinator, statusCoordinator,
-                locationBarDataProvider, profileSupplier, windowDelegate, windowAndroid,
-                overrideUrlLoadingDelegate, voiceRecognitionHandler,
-                assistantVoiceSearchServiceSupplier);
+                locationBarDataProvider, windowDelegate, windowAndroid, overrideUrlLoadingDelegate,
+                voiceRecognitionHandler, assistantVoiceSearchServiceSupplier);
         setUrlBarFocusable(true);
         mPendingSearchPromoDecision = LocaleManager.getInstance().needToCheckForSearchEnginePromo();
         getAutocompleteCoordinator().setShouldPreventOmniboxAutocomplete(

chrome/android/junit/src/org/chromium/chrome/browser/omnibox/LocationBarMediatorTest.java

@@ -4,9 +4,13 @@
 
 package org.chromium.chrome.browser.omnibox;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.notNull;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
 import android.content.Context;
@@ -16,17 +20,26 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestRule;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
 import org.robolectric.annotation.Config;
 
+import org.chromium.base.supplier.ObservableSupplierImpl;
 import org.chromium.base.supplier.OneshotSupplierImpl;
 import org.chromium.base.test.BaseRobolectricTestRunner;
+import org.chromium.base.test.util.JniMocker;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.omnibox.UrlBarCoordinator.SelectionState;
+import org.chromium.chrome.browser.omnibox.status.StatusCoordinator;
+import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator;
 import org.chromium.chrome.browser.omnibox.voice.AssistantVoiceSearchService;
+import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl;
+import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.profiles.ProfileJni;
 import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
+import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.test.util.browser.Features;
 import org.chromium.components.embedder_support.util.UrlConstants;
 import org.chromium.components.search_engines.TemplateUrlService;
@@ -40,6 +53,8 @@ public class LocationBarMediatorTest {
     public MockitoRule mMockitoRule = MockitoJUnit.rule();
     @Rule
     public TestRule mProcessor = new Features.JUnitProcessor();
+    @Rule
+    public JniMocker mJniMocker = new JniMocker();
 
     @Mock
     LocationBarLayout mLocationBarLayout;
@@ -51,15 +66,36 @@ public class LocationBarMediatorTest {
     private LocationBarDataProvider mLocationBarDataProvider;
     @Mock
     private OneshotSupplierImpl<AssistantVoiceSearchService> mAssistantVoiceSearchSupplier;
+    @Mock
+    private Profile.Natives mProfileNativesJniMock;
+    @Mock
+    private Tab mTab;
+    @Mock
+    private AutocompleteCoordinator mAutocompleteCoordinator;
+    @Mock
+    private UrlBarCoordinator mUrlCoordinator;
+    @Mock
+    private StatusCoordinator mStatusCoordintor;
+    @Mock
+    private PrivacyPreferencesManagerImpl mPrivacyPreferencesManager;
+    @Mock
+    private OmniboxPrerender.Natives mPrerenderJni;
+    @Mock
+    private SearchEngineLogoUtils.Delegate mSearchEngineDelegate;
 
+    private ObservableSupplierImpl<Profile> mProfileSupplier = new ObservableSupplierImpl<>();
     private LocationBarMediator mMediator;
 
     @Before
     public void setUp() {
         doReturn(mContext).when(mLocationBarLayout).getContext();
         TemplateUrlServiceFactory.setInstanceForTesting(mTemplateUrlService);
-        mMediator = new LocationBarMediator(
-                mLocationBarLayout, mLocationBarDataProvider, mAssistantVoiceSearchSupplier);
+        mJniMocker.mock(ProfileJni.TEST_HOOKS, mProfileNativesJniMock);
+        mJniMocker.mock(OmniboxPrerenderJni.TEST_HOOKS, mPrerenderJni);
+        mMediator = new LocationBarMediator(mLocationBarLayout, mLocationBarDataProvider,
+                mAssistantVoiceSearchSupplier, mProfileSupplier, mPrivacyPreferencesManager);
+        mMediator.setCoordinators(mUrlCoordinator, mAutocompleteCoordinator, mStatusCoordintor);
+        SearchEngineLogoUtils.setDelegateForTesting(mSearchEngineDelegate);
     }
 
     @Test
@@ -112,4 +148,36 @@ public class LocationBarMediatorTest {
         mMediator.revertChanges();
         verify(mLocationBarLayout).setUrl("http://url.com");
     }
+
+    @Test
+    public void testOnSuggestionsChanged() {
+        ArgumentCaptor<OmniboxPrerender> omniboxPrerenderCaptor =
+                ArgumentCaptor.forClass(OmniboxPrerender.class);
+        doReturn(123L).when(mPrerenderJni).init(omniboxPrerenderCaptor.capture());
+        mMediator.onFinishNativeInitialization();
+        Profile profile = mock(Profile.class);
+        mProfileSupplier.set(profile);
+        verify(mPrerenderJni)
+                .initializeForProfile(123L, omniboxPrerenderCaptor.getValue(), profile);
+
+        doReturn(false).when(mPrivacyPreferencesManager).shouldPrerender();
+        mMediator.onSuggestionsChanged("text", true);
+        verify(mPrerenderJni, never())
+                .prerenderMaybe(
+                        anyLong(), any(), anyString(), anyString(), anyLong(), any(), any());
+
+        doReturn(true).when(mPrivacyPreferencesManager).shouldPrerender();
+        doReturn(true).when(mLocationBarDataProvider).hasTab();
+        doReturn(mTab).when(mLocationBarDataProvider).getTab();
+        doReturn("originalUrl").when(mLocationBarLayout).getOriginalUrl();
+        doReturn(456L).when(mAutocompleteCoordinator).getCurrentNativeAutocompleteResult();
+        doReturn("text").when(mUrlCoordinator).getTextWithoutAutocomplete();
+        doReturn(true).when(mUrlCoordinator).shouldAutocomplete();
+
+        mMediator.onSuggestionsChanged("textWithAutocomplete", true);
+        verify(mPrerenderJni)
+                .prerenderMaybe(123L, omniboxPrerenderCaptor.getValue(), "text", "originalUrl",
+                        456L, profile, mTab);
+        verify(mUrlCoordinator).setAutocompleteText("text", "textWithAutocomplete");
+    }
 }