remove old widgets on upgrade scenario android

android/java/apk_for_test.flags

@@ -107,8 +107,13 @@
     *** runMenuItemEnterAnimations(...);
 }
 
+-keep class org.chromium.chrome.browser.quickactionsearchwidget.QuickActionSearchWidgetProvider$QuickActionSearchWidgetProviderDino
+
+-keep class org.chromium.chrome.browser.quickactionsearchwidget.QuickActionSearchWidgetProvider$QuickActionSearchWidgetProviderSearch
+
 -keep class org.chromium.chrome.browser.quickactionsearchwidget.QuickActionSearchWidgetProvider {
     *** setWidgetEnabled(...);
+    *** setWidgetComponentEnabled(...);
 }
 
 -keep class org.chromium.chrome.browser.quickactionsearchwidget.BraveQuickActionSearchWidgetProvider {

android/java/org/chromium/chrome/browser/quickactionsearchwidget/BraveQuickActionSearchWidgetProvider.java

@@ -7,12 +7,20 @@
 
 package org.chromium.chrome.browser.quickactionsearchwidget;
 
+import androidx.annotation.NonNull;
+
 import org.chromium.chrome.browser.quickactionsearchwidget.QuickActionSearchWidgetProvider;
 
 public abstract class BraveQuickActionSearchWidgetProvider extends QuickActionSearchWidgetProvider {
     public static void setWidgetEnabled(
             boolean shouldEnableQuickActionSearchWidget, boolean shouldEnableDinoVariant) {
-        // We don't need to do anything here as in QuickActionSearchWidgetProvider we only set dino
-        // and quick search widgets.
+        setWidgetComponentEnabled(QuickActionSearchWidgetProviderSearch.class, false);
+        setWidgetComponentEnabled(QuickActionSearchWidgetProviderDino.class, false);
+    }
+
+    public static void setWidgetComponentEnabled(
+            @NonNull Class<? extends QuickActionSearchWidgetProvider> component,
+            boolean shouldEnableWidgetComponent) {
+        assert false : "setWidgetComponentEnabled should be redirected to parent in bytecode!";
     }
 }