Merge pull request #12133 from brave/android_revert_context_menu

Revert "[Android] Made context menu option 'Open in new tab' visible"
brave · Feb 3, 2022 · e6952ec · e6952ec
2 parents 77e7874 + d27bb48
commit e6952ec
Show file tree

Hide file tree

Showing 11 changed files with 0 additions and 89 deletions.
diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags
@@ -456,7 +456,3 @@
 -keep class org.chromium.chrome.browser.ui.default_browser_promo.DefaultBrowserPromoUtils {
     *** prepareLaunchPromoIfNeeded(...);
 }
-
--keep class org.chromium.chrome.browser.flags.CachedFeatureFlags {
-    *** getConsistentBooleanValue(...);
-}
diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
@@ -220,7 +220,6 @@ public void testClassesExist() throws Exception {
         Assert.assertTrue(classExists("org/chromium/chrome/browser/autofill/AutofillPopupBridge"));
         Assert.assertTrue(
                 classExists("org/chromium/chrome/browser/autofill/BraveAutofillPopupBridge"));
-        Assert.assertTrue(classExists("org/chromium/chrome/browser/flags/CachedFeatureFlags"));
     }
 
     @Test
@@ -365,8 +364,6 @@ public void testMethodsExist() throws Exception {
                 "getActionButtonTintList", false, null));
         Assert.assertTrue(methodExists("org/chromium/chrome/browser/ntp/NewTabPage",
                 "updateSearchProviderHasLogo", false, null));
-        Assert.assertTrue(methodExists("org/chromium/chrome/browser/flags/CachedFeatureFlags",
-                "getConsistentBooleanValue", false, null));
     }
 
     @Test

diff --git a/android/javatests/org/chromium/chrome/browser/contextmenu/BraveContextMenuPopulatorTest.java b/android/javatests/org/chromium/chrome/browser/contextmenu/BraveContextMenuPopulatorTest.java
diff --git a/browser/flags/BUILD.gn b/browser/flags/BUILD.gn
diff --git a/...ser/flags/android/java/src/org/chromium/chrome/browser/flags/BraveCachedFeatureFlags.java b/...ser/flags/android/java/src/org/chromium/chrome/browser/flags/BraveCachedFeatureFlags.java
diff --git a/build/android/bytecode/BUILD.gn b/build/android/bytecode/BUILD.gn
@@ -16,7 +16,6 @@ java_binary("java_bytecode_rewriter") {
     "//brave/build/android/bytecode/java/org/brave/bytecode/BraveBookmarkUtilsClassAdapter.java",
     "//brave/build/android/bytecode/java/org/brave/bytecode/BraveBottomControlsCoordinatorClassAdapter.java",
     "//brave/build/android/bytecode/java/org/brave/bytecode/BraveBottomControlsMediatorClassAdapter.java",
-    "//brave/build/android/bytecode/java/org/brave/bytecode/BraveCachedFeatureFlagsClassAdapter.java",
     "//brave/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java",
     "//brave/build/android/bytecode/java/org/brave/bytecode/BraveClassVisitor.java",
     "//brave/build/android/bytecode/java/org/brave/bytecode/BraveCommandLineInitUtilClassAdapter.java",

diff --git a/build/android/bytecode/bytecode_rewriter.gni b/build/android/bytecode/bytecode_rewriter.gni
@@ -3,15 +3,13 @@ import("//build/config/python.gni")
 brave_bytecode_jars = [
   "obj/brave/android/features/tab_ui/java.javac.jar",
   "obj/brave/android/java/org/chromium/chrome/browser/search_engines/settings/java.javac.jar",
-  "obj/brave/browser/flags/java.javac.jar",
   "obj/brave/browser/notifications/java.javac.jar",
   "obj/brave/browser/ui/android/omnibox/java.javac.jar",
   "obj/brave/browser/ui/android/theme/java.javac.jar",
   "obj/brave/components/browser_ui/site_settings/android/java.javac.jar",
   "obj/chrome/android/base_module_java.javac.jar",
   "obj/chrome/android/chrome_java.javac.jar",
   "obj/chrome/android/features/tab_ui/java.javac.jar",
-  "obj/chrome/browser/flags/java.javac.jar",
   "obj/chrome/browser/notifications/java.javac.jar",
   "obj/chrome/browser/safe_browsing/android/java.javac.jar",
   "obj/chrome/browser/search_engines/android/java.javac.jar",

diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveCachedFeatureFlagsClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveCachedFeatureFlagsClassAdapter.java
diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java
@@ -17,7 +17,6 @@ public static ClassVisitor createAdapter(ClassVisitor chain) {
         chain = new BraveBookmarkUtilsClassAdapter(chain);
         chain = new BraveBottomControlsCoordinatorClassAdapter(chain);
         chain = new BraveBottomControlsMediatorClassAdapter(chain);
-        chain = new BraveCachedFeatureFlagsClassAdapter(chain);
         chain = new BraveCommandLineInitUtilClassAdapter(chain);
         chain = new BraveContentSettingsResourcesClassAdapter(chain);
         chain = new BraveDefaultBrowserPromoUtilsClassAdapter(chain);

diff --git a/build/android/config.gni b/build/android/config.gni
@@ -13,7 +13,6 @@ brave_android_manifest_includes = [
 
 brave_chrome_java_deps = [
   "//brave/android/java/org/chromium/chrome/browser/search_engines/settings:java",
-  "//brave/browser/flags:java",
   "//brave/browser/notifications:brave_java",
   "//brave/browser/notifications:java",
   "//brave/browser/safe_browsing/android/java/src/org/chromium/chrome/browser/safe_browsing/settings:java",

diff --git a/test/BUILD.gn b/test/BUILD.gn
@@ -1165,7 +1165,6 @@ if (is_android) {
     sources = [
       "//brave/android/javatests/org/chromium/chrome/browser/BytecodeTest.java",
       "//brave/android/javatests/org/chromium/chrome/browser/brave_wallet/BraveWalletUtilsTest.java",
-      "//brave/android/javatests/org/chromium/chrome/browser/contextmenu/BraveContextMenuPopulatorTest.java",
       "//brave/android/javatests/org/chromium/chrome/browser/password_manager/settings/BravePasswordSettingsTest.java",
       "//brave/android/javatests/org/chromium/chrome/browser/privacy/settings/BravePrivacySettingsTest.java",
       "//brave/android/javatests/org/chromium/chrome/browser/safe_browsing/settings/BraveSafeBrowsingSettingsFragmentTest.java",