diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags index aff405898a6..59c3b6d4ce3 100644 --- a/android/java/apk_for_test.flags +++ b/android/java/apk_for_test.flags @@ -591,7 +591,7 @@ *** get(...); } --keep class org.chromium.chrome.browser.partnercustomizations.CustomizationProviderDelegateImpl { +-keep class org.chromium.chrome.browser.partnercustomizations.CustomizationProviderDelegateUpstreamImpl { public (...); } diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index d6c732d13a6..cdf5ab1e4a5 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -286,7 +286,7 @@ public class BytecodeTest { classExists("org/chromium/components/variations/firstrun/VariationsSeedFetcher")); Assert.assertTrue( classExists( - "org/chromium/chrome/browser/partnercustomizations/CustomizationProviderDelegateImpl")); + "org/chromium/chrome/browser/partnercustomizations/CustomizationProviderDelegateUpstreamImpl")); Assert.assertTrue( classExists( "org/chromium/chrome/browser/share/send_tab_to_self/ManageAccountDevicesLinkView")); // presubmit: ignore-long-line @@ -1371,7 +1371,7 @@ public class BytecodeTest { Profile.class)); Assert.assertTrue( constructorsMatch( - "org/chromium/chrome/browser/partnercustomizations/CustomizationProviderDelegateImpl", + "org/chromium/chrome/browser/partnercustomizations/CustomizationProviderDelegateUpstreamImpl", "org/chromium/chrome/browser/partnercustomizations/BraveCustomizationProviderDelegateImpl")); Assert.assertTrue( constructorsMatch( diff --git a/browser/partnercustomizations/java/src/org/chromium/chrome/browser/partnercustomizations/BraveCustomizationProviderDelegateImpl.java b/browser/partnercustomizations/java/src/org/chromium/chrome/browser/partnercustomizations/BraveCustomizationProviderDelegateImpl.java index d69d33f05b7..e26ad6dd090 100644 --- a/browser/partnercustomizations/java/src/org/chromium/chrome/browser/partnercustomizations/BraveCustomizationProviderDelegateImpl.java +++ b/browser/partnercustomizations/java/src/org/chromium/chrome/browser/partnercustomizations/BraveCustomizationProviderDelegateImpl.java @@ -6,7 +6,8 @@ package org.chromium.chrome.browser.partnercustomizations; /** Default ContextProviderPackageDelegateImpl implementation. */ -public class BraveCustomizationProviderDelegateImpl extends CustomizationProviderDelegateImpl { +public class BraveCustomizationProviderDelegateImpl + extends CustomizationProviderDelegateUpstreamImpl { @Override public String getHomepage() { return null; diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveCustomizationProviderDelegateImplClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveCustomizationProviderDelegateImplClassAdapter.java index b2da654d489..10529487de0 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveCustomizationProviderDelegateImplClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveCustomizationProviderDelegateImplClassAdapter.java @@ -9,7 +9,7 @@ import org.objectweb.asm.ClassVisitor; public class BraveCustomizationProviderDelegateImplClassAdapter extends BraveClassVisitor { static String sCustomizationProviderDelegateImplClassName = - "org/chromium/chrome/browser/partnercustomizations/CustomizationProviderDelegateImpl"; + "org/chromium/chrome/browser/partnercustomizations/CustomizationProviderDelegateUpstreamImpl"; static String sBraveCustomizationProviderDelegateImplClassName = "org/chromium/chrome/browser/partnercustomizations/BraveCustomizationProviderDelegateImpl";