Merge pull request #12034 from brave/android_ntp_google_fix

[Android] Fixed NTP with Google as dse

android/java/apk_for_test.flags

@@ -54,6 +54,7 @@
     *** mNewTabPageLayout;
     *** mFeedSurfaceProvider;
     *** mToolbarSupplier;
+    *** updateSearchProviderHasLogo(...);
 }
 
 -keep class org.chromium.chrome.browser.ntp.BraveNewTabPage {

android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java

@@ -86,4 +86,9 @@ public class BraveNewTabPage extends NewTabPage {
                 /* overScrollDisabled= */ false, /* viewportView= */ null,
                 /* actionDelegate= */ null, HelpAndFeedbackLauncherImpl.getInstance());
     }
+
+    public void updateSearchProviderHasLogo() {
+        // Search provider logo is not used in Brave's NTP.
+        mSearchProviderHasLogo = false;
+    }
 }

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

@@ -356,6 +356,8 @@ public class BytecodeTest {
         Assert.assertTrue(methodExists(
                 "org/chromium/chrome/browser/tasks/tab_management/BraveTabUiThemeProvider",
                 "getActionButtonTintList", false, null));
+        Assert.assertTrue(methodExists("org/chromium/chrome/browser/ntp/NewTabPage",
+                "updateSearchProviderHasLogo", false, null));
     }
 
     @Test

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

@@ -27,5 +27,9 @@ public class BraveNewTabPageClassAdapter extends BraveClassVisitor {
 
         deleteField(sBraveNewTabPageClassName, "mToolbarSupplier");
         makeProtectedField(sNewTabPageClassName, "mToolbarSupplier");
+
+        makePublicMethod(sNewTabPageClassName, "updateSearchProviderHasLogo");
+        addMethodAnnotation(
+                sBraveNewTabPageClassName, "updateSearchProviderHasLogo", "Ljava/lang/Override;");
     }
 }