[Android] Fix for missing edit url suggestion on url focus

android/java/apk_for_test.flags

@@ -857,3 +857,11 @@
 -keep class org.chromium.chrome.browser.omnibox.BraveAutocompleteEditText {
     public <init>(...);
 }
+
+-keep class org.chromium.chrome.browser.omnibox.suggestions.editurl.EditUrlSuggestionProcessor {
+    public <init>(...);
+}
+
+-keep class org.chromium.chrome.browser.omnibox.suggestions.editurl.BraveEditUrlSuggestionProcessor {
+    public <init>(...);
+}

android/javatests/org/chromium/chrome/browser/BytecodeTest.java

@@ -85,6 +85,7 @@
 import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteDelegate;
 import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsDropdownEmbedder;
 import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsDropdownScrollListener;
+import org.chromium.chrome.browser.omnibox.suggestions.SuggestionHost;
 import org.chromium.chrome.browser.omnibox.suggestions.basic.BasicSuggestionProcessor.BookmarkState;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.share.ShareDelegateImpl;
@@ -159,6 +160,7 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.List;
+import java.util.Optional;
 import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -1595,6 +1597,15 @@ public void testConstructorsExistAndMatch() throws Exception {
                         "org/chromium/chrome/browser/omnibox/BraveAutocompleteEditText",
                         Context.class,
                         AttributeSet.class));
+        Assert.assertTrue(
+                constructorsMatch(
+                        "org/chromium/chrome/browser/omnibox/suggestions/editurl/EditUrlSuggestionProcessor",
+                        "org/chromium/chrome/browser/omnibox/suggestions/editurl/BraveEditUrlSuggestionProcessor",
+                        Context.class,
+                        SuggestionHost.class,
+                        Optional.class,
+                        Supplier.class,
+                        Supplier.class));
     }
 
     @Test

browser/ui/android/omnibox/BUILD.gn

@@ -23,6 +23,7 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/omnibox/suggestions/brave_search/BraveSearchBannerProcessor.java",
     "java/src/org/chromium/chrome/browser/omnibox/suggestions/brave_search/BraveSearchBannerProperties.java",
     "java/src/org/chromium/chrome/browser/omnibox/suggestions/brave_search/BraveSearchBannerViewBinder.java",
+    "java/src/org/chromium/chrome/browser/omnibox/suggestions/editurl/BraveEditUrlSuggestionProcessor.java",
   ]
 
   deps = [

browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/editurl/BraveEditUrlSuggestionProcessor.java

@@ -0,0 +1,45 @@
+/* Copyright (c) 2024 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+package org.chromium.chrome.browser.omnibox.suggestions.editurl;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import org.chromium.base.supplier.Supplier;
+import org.chromium.chrome.browser.omnibox.styles.OmniboxImageSupplier;
+import org.chromium.chrome.browser.omnibox.suggestions.SuggestionHost;
+import org.chromium.chrome.browser.share.ShareDelegate;
+import org.chromium.chrome.browser.tab.Tab;
+import org.chromium.components.omnibox.AutocompleteMatch;
+
+import java.util.Optional;
+
+public class BraveEditUrlSuggestionProcessor extends EditUrlSuggestionProcessor {
+    private final @NonNull Supplier<Tab> mTabSupplier;
+
+    public BraveEditUrlSuggestionProcessor(
+            Context context,
+            SuggestionHost suggestionHost,
+            Optional<OmniboxImageSupplier> imageSupplier,
+            Supplier<Tab> tabSupplier,
+            Supplier<ShareDelegate> shareDelegateSupplier) {
+        super(context, suggestionHost, imageSupplier, tabSupplier, shareDelegateSupplier);
+
+        mTabSupplier = tabSupplier;
+    }
+
+    @Override
+    public boolean doesProcessSuggestion(@NonNull AutocompleteMatch suggestion, int position) {
+        // If url hasn't changed we still want to show the edit url suggestion.
+        Tab activeTab = mTabSupplier.get();
+        if (activeTab != null && suggestion.getUrl().equals(activeTab.getUrl())) {
+            return true;
+        }
+
+        return super.doesProcessSuggestion(suggestion, position);
+    }
+}

build/android/bytecode/BUILD.gn

@@ -43,6 +43,7 @@ java_binary("java_bytecode_rewriter") {
     "//brave/build/android/bytecode/java/org/brave/bytecode/BraveDropdownItemViewInfoListBuilderClassAdapter.java",
     "//brave/build/android/bytecode/java/org/brave/bytecode/BraveDropdownItemViewInfoListManagerClassAdapter.java",
     "//brave/build/android/bytecode/java/org/brave/bytecode/BraveDynamicColorsClassAdapter.java",
+    "//brave/build/android/bytecode/java/org/brave/bytecode/BraveEditUrlSuggestionProcessorClassAdapter.java",
     "//brave/build/android/bytecode/java/org/brave/bytecode/BraveExternalNavigationHandlerClassAdapter.java",
     "//brave/build/android/bytecode/java/org/brave/bytecode/BraveFeedSurfaceCoordinatorClassAdapter.java",
     "//brave/build/android/bytecode/java/org/brave/bytecode/BraveFeedSurfaceMediatorClassAdapter.java",

build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java

@@ -42,6 +42,7 @@ public static ClassVisitor createAdapter(ClassVisitor chain) {
         chain = new BraveDropdownItemViewInfoListBuilderClassAdapter(chain);
         chain = new BraveDropdownItemViewInfoListManagerClassAdapter(chain);
         chain = new BraveDynamicColorsClassAdapter(chain);
+        chain = new BraveEditUrlSuggestionProcessorClassAdapter(chain);
         chain = new BraveExternalNavigationHandlerClassAdapter(chain);
         chain = new BraveFeedSurfaceCoordinatorClassAdapter(chain);
         chain = new BraveFeedSurfaceMediatorClassAdapter(chain);

build/android/bytecode/java/org/brave/bytecode/BraveEditUrlSuggestionProcessorClassAdapter.java

@@ -0,0 +1,21 @@
+/* Copyright (c) 2024 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+package org.brave.bytecode;
+
+import org.objectweb.asm.ClassVisitor;
+
+public class BraveEditUrlSuggestionProcessorClassAdapter extends BraveClassVisitor {
+    static String sEditUrlSuggestionProcessorName =
+            "org/chromium/chrome/browser/omnibox/suggestions/editurl/EditUrlSuggestionProcessor";
+    static String sBraveEditUrlSuggestionProcessorName =
+            "org/chromium/chrome/browser/omnibox/suggestions/editurl/BraveEditUrlSuggestionProcessor";
+
+    public BraveEditUrlSuggestionProcessorClassAdapter(ClassVisitor visitor) {
+        super(visitor);
+
+        redirectConstructor(sEditUrlSuggestionProcessorName, sBraveEditUrlSuggestionProcessorName);
+    }
+}