[ToolbarMVC] Use LocationBarCoordinator in SearchActivity

This will allow it to continue to function as logic migrates out of
LocationBarLayout. SearchActivity-specific logic remains in
SearchActivityLocationBarLayout for now.

Change-Id: I1a32a6fbfd584590b982ecb4c8639664e752819d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2495785
Commit-Queue: Patrick Noland <pnoland@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Reviewed-by: bttk <bttk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#823210}

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

@@ -54,11 +54,12 @@ public final class LocationBarCoordinator implements LocationBar, FakeboxDelegat
     /**
      * Creates {@link LocationBarCoordinator} and its subcoordinator: {@link
      * LocationBarCoordinatorPhone} or {@link LocationBarCoordinatorTablet}, depending on the type
-     * of {@code locationBarLayout}.
+     * of {@code locationBarLayout}; no sub-coordinator is created for other LocationBarLayout
+     * subclasses.
      * {@code LocationBarCoordinator} owns the subcoordinator. Destroying the former destroys the
      * latter.
      *
-     * @param locationBarLayout Inflated {@link LocationBarPhone} or {@link LocationBarTablet}.
+     * @param locationBarLayout Inflated {@link LocationBarLayout}.
      *         {@code LocationBarCoordinator} takes ownership and will destroy this object.
      * @param profileObservableSupplier The supplier of the active profile.
      * @param locationBarDataProvider {@link LocationBarDataProvider} to be used for accessing
@@ -73,8 +74,6 @@ public final class LocationBarCoordinator implements LocationBar, FakeboxDelegat
      * @param incognitoStateProvider An {@link IncognitoStateProvider} to access the current
      *         incognito state.
      * @param activityLifecycleDispatcher Allows observation of the activity state.
-     * @throws IllegalArgumentException if the view is neither {@link LocationBarPhone} nor {@link
-     *         LocationBarTablet}.
      */
     public LocationBarCoordinator(View locationBarLayout,
             ObservableSupplier<Profile> profileObservableSupplier,
@@ -92,10 +91,6 @@ public final class LocationBarCoordinator implements LocationBar, FakeboxDelegat
         } else if (locationBarLayout instanceof LocationBarTablet) {
             mSubCoordinator =
                     new LocationBarCoordinatorTablet((LocationBarTablet) locationBarLayout);
-        } else {
-            assert false : "Expected LocationBarPhone or LocationBarTablet, got "
-                           + locationBarLayout.getClass();
-            throw new IllegalArgumentException(locationBarLayout.getClass().toString());
         }
 
         mLocationbarDataProvider = locationBarDataProvider;

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

@@ -33,6 +33,7 @@ import org.chromium.chrome.browser.document.ChromeLauncherActivity;
 import org.chromium.chrome.browser.init.AsyncInitializationActivity;
 import org.chromium.chrome.browser.init.SingleWindowKeyboardVisibilityDelegate;
 import org.chromium.chrome.browser.locale.LocaleManager;
+import org.chromium.chrome.browser.omnibox.LocationBarCoordinator;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabBuilder;
@@ -110,6 +111,7 @@ public class SearchActivity extends AsyncInitializationActivity
 
     /** The View that represents the search box. */
     private SearchActivityLocationBarLayout mSearchBox;
+    private LocationBarCoordinator mLocationBarCoordinator;
 
     private SnackbarManager mSnackbarManager;
     private SearchBoxDataProvider mSearchBoxDataProvider;
@@ -164,10 +166,11 @@ public class SearchActivity extends AsyncInitializationActivity
         mSearchBox = (SearchActivityLocationBarLayout) mContentView.findViewById(
                 R.id.search_location_bar);
         mSearchBox.setDelegate(this);
-        mSearchBox.setLocationBarDataProvider(mSearchBoxDataProvider);
-        mSearchBox.initializeControls(
-                new WindowDelegate(getWindow()), getWindowAndroid(), null, null, null, null);
-        mSearchBox.setProfileSupplier(mProfileSupplier);
+        mLocationBarCoordinator = new LocationBarCoordinator(mSearchBox, mProfileSupplier,
+                mSearchBoxDataProvider, null, new WindowDelegate(getWindow()), getWindowAndroid(),
+                /*activityTabProvider=*/null, /*modalDialogManagerSupplier=*/null,
+                /*shareDelegateSupplier=*/null, /*incognitoStateProvider=*/null,
+                getLifecycleDispatcher());
 
         // Kick off everything needed for the user to type into the box.
         beginQuery();
@@ -252,7 +255,6 @@ public class SearchActivity extends AsyncInitializationActivity
         mTab.loadUrl(new LoadUrlParams(ContentUrlConstants.ABOUT_BLANK_DISPLAY_URL));
 
         mSearchBoxDataProvider.onNativeLibraryReady(mTab);
-        mSearchBox.onFinishNativeInitialization();
         mProfileSupplier.set(Profile.fromWebContents(webContents));
 
         // Force the user to choose a search engine if they have to.