From 28b95d7267e2f103405eb125a4ea9b9292fa9faf Mon Sep 17 00:00:00 2001
From: Artem Samoilenko <artem@brave.com>
Date: Wed, 25 Sep 2024 05:29:48 -0400
Subject: [PATCH] [Android] Use ServiceLoaderUtil with AppHooks

Chromium change:
https://source.chromium.org/chromium/chromium/src/+/21849f23ddc564a43b12c209f88cb96621c21040

Use ServiceLoaderUtil with AppHooks

Bug: 40901855
---
 android/android_browser_tests.gni                               | 1 -
 android/java/apk_for_test.flags                                 | 2 +-
 android/java/org/chromium/chrome/browser/BraveAppHooks.java     | 2 +-
 .../java/org/brave/bytecode/BraveAppHooksClassAdapter.java      | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/android/android_browser_tests.gni b/android/android_browser_tests.gni
index e677fa573b4..15b66fd1f75 100644
--- a/android/android_browser_tests.gni
+++ b/android/android_browser_tests.gni
@@ -136,7 +136,6 @@ android_only_test_deps = [
   "//brave/components/language/android:java",
   "//brave/third_party/android_deps:com_android_installreferrer_java",
   "//chrome:chrome_android_core",
-  "//chrome/android:app_hooks_java",
   "//chrome/android:delegate_public_impl_java",
   "//chrome/browser/flags:flags_android",
   "//chrome/browser/lens:delegate_public_impl_java",
diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags
index 278b805207a..69b680ce149 100644
--- a/android/java/apk_for_test.flags
+++ b/android/java/apk_for_test.flags
@@ -645,7 +645,7 @@
     public <init>(...);
 }
 
--keep class org.chromium.chrome.browser.AppHooksImpl {
+-keep class org.chromium.chrome.browser.AppHooks {
     public <init>(...);
 }
 
diff --git a/android/java/org/chromium/chrome/browser/BraveAppHooks.java b/android/java/org/chromium/chrome/browser/BraveAppHooks.java
index 04065f7ea51..4d651837de3 100644
--- a/android/java/org/chromium/chrome/browser/BraveAppHooks.java
+++ b/android/java/org/chromium/chrome/browser/BraveAppHooks.java
@@ -7,7 +7,7 @@ package org.chromium.chrome.browser;
 
 import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmark;
 
-public class BraveAppHooks extends AppHooksImpl {
+public class BraveAppHooks extends AppHooks {
     @Override
     public PartnerBookmark.BookmarkIterator getPartnerBookmarkIterator() {
         return null;
diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveAppHooksClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveAppHooksClassAdapter.java
index 8c7da2603a8..90844345ffd 100644
--- a/build/android/bytecode/java/org/brave/bytecode/BraveAppHooksClassAdapter.java
+++ b/build/android/bytecode/java/org/brave/bytecode/BraveAppHooksClassAdapter.java
@@ -8,7 +8,7 @@ package org.brave.bytecode;
 import org.objectweb.asm.ClassVisitor;
 
 public class BraveAppHooksClassAdapter extends BraveClassVisitor {
-    static String sAppHooksClassName = "org/chromium/chrome/browser/AppHooksImpl";
+    static String sAppHooksClassName = "org/chromium/chrome/browser/AppHooks";
     static String sBraveAppHooksClassName = "org/chromium/chrome/browser/BraveAppHooks";
 
     public BraveAppHooksClassAdapter(ClassVisitor visitor) {