[cr146][Android] LocationBarMediator.performSearchQuery removed

Chromium change:
https://source.chromium.org/chromium/chromium/src/+/9b5048b5cd9efa089ef892b9f53c212f433d403b

	Nuke some dead code.

	Tests for this code caused a bit of grief, and this code is not called
	anywhere, so how about we delete it?

	Change-Id: I050254c65f76658cbc1e14867847280550da3246
	Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7504590

android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarMediator.java

@@ -9,6 +9,7 @@ import android.Manifest;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.Build;
+import android.text.TextUtils;
 import android.view.View;
 
 import androidx.appcompat.app.AppCompatActivity;
@@ -23,6 +24,7 @@ import org.chromium.chrome.browser.lens.LensController;
 import org.chromium.chrome.browser.locale.LocaleManager;
 import org.chromium.chrome.browser.multiwindow.MultiInstanceManager;
 import org.chromium.chrome.browser.omnibox.fusebox.FuseboxCoordinator;
+import org.chromium.chrome.browser.omnibox.suggestions.OmniboxLoadUrlParams;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.theme.ThemeUtils;
@@ -30,6 +32,7 @@ import org.chromium.chrome.browser.ui.theme.BrandedColorScheme;
 import org.chromium.components.browser_ui.accessibility.PageZoomIndicatorCoordinator;
 import org.chromium.components.omnibox.AutocompleteRequestType;
 import org.chromium.components.search_engines.TemplateUrlService;
+import org.chromium.ui.base.PageTransition;
 import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.modaldialog.ModalDialogManager;
 import org.chromium.ui.permissions.PermissionCallback;
@@ -216,4 +219,25 @@ public class BraveLocationBarMediator extends LocationBarMediator {
                     "BraveLocationBarQRDialogFragment");
         }
     }
+
+    // This method was removed at upstream's LocationBarMediator.
+    // Backported it here to still have ability immediately jump to search
+    // result when QR code is scanned for the regular strings, not the URLs.
+    // See BraveLocationBarQRDialogFragment.onDetectedQrCode.
+    public void performSearchQuery(String query) {
+        if (TextUtils.isEmpty(query)) return;
+
+        TemplateUrlService templateUrlService = mTemplateUrlServiceSupplier.get();
+        assert templateUrlService != null;
+        String queryUrl = templateUrlService.getUrlForSearchQuery(query, null);
+
+        if (!TextUtils.isEmpty(queryUrl)) {
+            loadUrl(
+                    new OmniboxLoadUrlParams.Builder(queryUrl, PageTransition.GENERATED)
+                            .setOpenInNewTab(false)
+                            .build());
+        } else {
+            setSearchQuery(query);
+        }
+    }
 }

android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarQRDialogFragment.java

@@ -32,7 +32,7 @@ public class BraveLocationBarQRDialogFragment extends DialogFragment
     private static final String TAG = "Scan QR Code Dialog";
 
     private QRCodeCameraManager mCameraManager;
-    private LocationBarMediator mLocationBarMediator;
+    private BraveLocationBarMediator mLocationBarMediator;
 
     // The Android Fragment framework requires a zero-argument constructor to
     // instantiate fragments. It usually happens on a fragment re-creation
@@ -41,12 +41,12 @@ public class BraveLocationBarQRDialogFragment extends DialogFragment
         super();
     }
 
-    private BraveLocationBarQRDialogFragment(LocationBarMediator locationBarMediator) {
+    private BraveLocationBarQRDialogFragment(BraveLocationBarMediator locationBarMediator) {
         mLocationBarMediator = locationBarMediator;
     }
 
     public static BraveLocationBarQRDialogFragment newInstance(
-            LocationBarMediator locationBarMediator) {
+            BraveLocationBarMediator locationBarMediator) {
         return new BraveLocationBarQRDialogFragment(locationBarMediator);
     }
 
@@ -148,7 +148,7 @@ public class BraveLocationBarQRDialogFragment extends DialogFragment
                                 if (Patterns.WEB_URL.matcher(barcodeValue).matches()) {
                                     mLocationBarMediator.setSearchQuery(barcodeValue);
                                 } else {
-                                    mLocationBarMediator.performSearchQuery(barcodeValue, null);
+                                    mLocationBarMediator.performSearchQuery(barcodeValue);
                                 }
                             });