JNI refactor: @NativeMethods conversion (//components).

This CL was generated by
//base/android/jni_generator/jni_refactorer.py.

Bug: 929661
Change-Id: I1e633b64e04b6acfbe63c141ecd287020d43b536
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1814696Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Reviewed-by: Sam Maier <smaier@chromium.org>
Auto-Submit: Eric Stevenson <estevenson@chromium.org>
Commit-Queue: Eric Stevenson <estevenson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#699934}

android_webview/apk/java/src/com/android/webview/chromium/LicenseContentProvider.java

@@ -14,7 +14,7 @@ import android.os.Bundle;
 import android.os.ParcelFileDescriptor;
 
 import org.chromium.base.FileUtils;
-import org.chromium.components.aboutui.CreditUtils;
+import org.chromium.components.aboutui.CreditUtilsJni;
 
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -50,7 +50,7 @@ public class LicenseContentProvider
     public void writeDataToPipe(
             ParcelFileDescriptor output, Uri uri, String mimeType, Bundle opts, String filename) {
         if (WebViewApkApplication.initializeNative()) {
-            CreditUtils.nativeWriteCreditsHtml(output.detachFd());
+            CreditUtilsJni.get().writeCreditsHtml(output.detachFd());
         } else {
             // Missing native library means we're the webview stub and licenses are stored as an
             // asset.

chrome/android/monochrome/java/src/com/android/webview/chromium/LicenseContentProvider.java

@@ -16,7 +16,7 @@ import android.os.ParcelFileDescriptor;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.library_loader.ProcessInitException;
 import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
-import org.chromium.components.aboutui.CreditUtils;
+import org.chromium.components.aboutui.CreditUtilsJni;
 
 import java.io.FileNotFoundException;
 
@@ -55,7 +55,7 @@ public class LicenseContentProvider
                 }
             }
         });
-        CreditUtils.nativeWriteCreditsHtml(output.detachFd());
+        CreditUtilsJni.get().writeCreditsHtml(output.detachFd());
     }
 
     @Override

components/about_ui/android/BUILD.gn

@@ -13,5 +13,7 @@ android_library("aboutui_java") {
   java_files = [ "java/src/org/chromium/components/aboutui/CreditUtils.java" ]
   deps = [
     "//base:base_java",
+    "//base:jni_java",
   ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }

components/about_ui/android/java/src/org/chromium/components/aboutui/CreditUtils.java

@@ -5,12 +5,16 @@
 package org.chromium.components.aboutui;
 
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 
 /** Credits-related utilities. */
 @JNINamespace("about_ui")
 public class CreditUtils {
     private CreditUtils() {}
 
-    /** Writes the chrome://credits HTML to the given descriptor. */
-    public static native void nativeWriteCreditsHtml(int fd);
+    @NativeMethods
+    public interface Natives {
+        /** Writes the chrome://credits HTML to the given descriptor. */
+        void writeCreditsHtml(int fd);
+    }
 }

components/autofill/android/BUILD.gn

@@ -100,10 +100,12 @@ android_library("autofill_java") {
 android_library("provider_java") {
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//components/autofill/core/common/mojom:mojo_types_java",
     "//content/public/android:content_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   java_files = [
     "java/src/org/chromium/components/autofill/AutofillProvider.java",
     "java/src/org/chromium/components/autofill/FormData.java",

components/autofill/android/java/src/org/chromium/components/autofill/AutofillProvider.java

@@ -11,6 +11,7 @@ import android.view.autofill.AutofillValue;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 import org.chromium.content_public.browser.WebContents;
 
 /**
@@ -132,7 +133,8 @@ public abstract class AutofillProvider {
      * @param formData the form to fill.
      */
     protected void autofill(long nativeAutofillProvider, FormData formData) {
-        nativeOnAutofillAvailable(nativeAutofillProvider, formData);
+        AutofillProviderJni.get().onAutofillAvailable(
+                nativeAutofillProvider, AutofillProvider.this, formData);
     }
 
     /**
@@ -147,6 +149,9 @@ public abstract class AutofillProvider {
     @CalledByNative
     protected abstract void onDidFillAutofillFormData();
 
-    private native void nativeOnAutofillAvailable(
-            long nativeAutofillProviderAndroid, FormData formData);
+    @NativeMethods
+    interface Natives {
+        void onAutofillAvailable(
+                long nativeAutofillProviderAndroid, AutofillProvider caller, FormData formData);
+    }
 }

components/autofill/android/java/src/org/chromium/components/autofill/FormData.java

@@ -6,6 +6,7 @@ package org.chromium.components.autofill;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 
 import java.util.ArrayList;
 
@@ -35,10 +36,11 @@ public class FormData {
     }
 
     private void popupFormFields(int fieldCount) {
-        FormFieldData formFieldData = nativeGetNextFormFieldData(mNativeObj);
+        FormFieldData formFieldData =
+                FormDataJni.get().getNextFormFieldData(mNativeObj, FormData.this);
         while (formFieldData != null) {
             mFields.add(formFieldData);
-            formFieldData = nativeGetNextFormFieldData(mNativeObj);
+            formFieldData = FormDataJni.get().getNextFormFieldData(mNativeObj, FormData.this);
         }
         assert mFields.size() == fieldCount;
     }
@@ -48,5 +50,8 @@ public class FormData {
         mNativeObj = 0;
     }
 
-    private native FormFieldData nativeGetNextFormFieldData(long nativeFormDataAndroid);
+    @NativeMethods
+    interface Natives {
+        FormFieldData getNextFormFieldData(long nativeFormDataAndroid, FormData caller);
+    }
 }

components/content_capture/android/BUILD.gn

@@ -22,8 +22,10 @@ source_set("android") {
 android_library("java") {
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//content/public/android:content_java",
   ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   java_files = [
     "java/src/org/chromium/components/content_capture/ContentCaptureConsumer.java",
     "java/src/org/chromium/components/content_capture/ContentCaptureController.java",

components/content_capture/android/java/src/org/chromium/components/content_capture/ContentCaptureController.java

@@ -6,6 +6,7 @@ package org.chromium.components.content_capture;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 
 /**
  * The abstract class to provide the whitelist and the runtime control of if ContentCapture should
@@ -25,7 +26,7 @@ public abstract class ContentCaptureController {
     }
 
     protected ContentCaptureController() {
-        mNativeContentCaptureController = nativeInit(this);
+        mNativeContentCaptureController = ContentCaptureControllerJni.get().init(this);
     }
 
     /**
@@ -59,10 +60,14 @@ public abstract class ContentCaptureController {
      * @param isRegex to indicate that the corresponding whitelist is the regex or not.
      */
     protected void setWhitelist(String[] whitelist, boolean[] isRegex) {
-        nativeSetWhitelist(mNativeContentCaptureController, whitelist, isRegex);
+        ContentCaptureControllerJni.get().setWhitelist(
+                mNativeContentCaptureController, ContentCaptureController.this, whitelist, isRegex);
     }
 
-    private static native long nativeInit(Object contentCaptureController);
-    private native void nativeSetWhitelist(
-            long nativeContentCaptureController, String[] whitelist, boolean[] isRegex);
+    @NativeMethods
+    interface Natives {
+        long init(Object contentCaptureController);
+        void setWhitelist(long nativeContentCaptureController, ContentCaptureController caller,
+                String[] whitelist, boolean[] isRegex);
+    }
 }

components/content_capture/android/java/src/org/chromium/components/content_capture/ContentCaptureFeatures.java

@@ -4,6 +4,7 @@
 package org.chromium.components.content_capture;
 
 import org.chromium.base.CommandLine;
+import org.chromium.base.annotations.NativeMethods;
 
 /**
  * The class to get if feature is enabled from native.
@@ -12,11 +13,15 @@ public class ContentCaptureFeatures {
     private static final String FLAG = "dump-captured-content-to-logcat-for-testing";
 
     public static boolean isEnabled() {
-        return nativeIsEnabled();
+        return ContentCaptureFeaturesJni.get().isEnabled();
     }
 
     public static boolean isDumpForTestingEnabled() {
         return CommandLine.getInstance().hasSwitch(FLAG);
     }
-    private static native boolean nativeIsEnabled();
+
+    @NativeMethods
+    interface Natives {
+        boolean isEnabled();
+    }
 }

components/content_capture/android/java/src/org/chromium/components/content_capture/ContentCaptureReceiverManager.java

@@ -6,6 +6,7 @@ package org.chromium.components.content_capture;
 
 import org.chromium.base.Log;
 import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.NativeMethods;
 import org.chromium.content_public.browser.WebContents;
 
 import java.util.Arrays;
@@ -20,7 +21,7 @@ public class ContentCaptureReceiverManager {
     private ContentCaptureConsumer mContentCaptureConsumer;
 
     public static ContentCaptureReceiverManager createOrGet(WebContents webContents) {
-        return nativeCreateOrGet(webContents);
+        return ContentCaptureReceiverManagerJni.get().createOrGet(webContents);
     }
 
     @CalledByNative
@@ -51,8 +52,9 @@ public class ContentCaptureReceiverManager {
     @CalledByNative
     private void didRemoveContent(Object[] session, long[] data) {
         FrameSession frameSession = toFrameSession(session);
-        if (mContentCaptureConsumer != null)
+        if (mContentCaptureConsumer != null) {
             mContentCaptureConsumer.onContentRemoved(frameSession, data);
+        }
         if (sDump.booleanValue()) {
             Log.i(TAG, "Removed Content: %s", frameSession.get(0) + " " + Arrays.toString(data));
         }
@@ -71,5 +73,8 @@ public class ContentCaptureReceiverManager {
         return frameSession;
     }
 
-    private static native ContentCaptureReceiverManager nativeCreateOrGet(WebContents webContents);
+    @NativeMethods
+    interface Natives {
+        ContentCaptureReceiverManager createOrGet(WebContents webContents);
+    }
 }

components/crash/android/BUILD.gn

@@ -23,7 +23,9 @@ java_cpp_enum("java_enums_srcjar") {
 android_library("java") {
   deps = [
     "//base:base_java",
+    "//base:jni_java",
   ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   srcjar_deps = [ ":java_enums_srcjar" ]
   java_files = _jni_sources
 }
@@ -62,7 +64,9 @@ generate_jni("java_handler_jni_headers") {
 android_library("handler_java") {
   deps = [
     "//base:base_java",
+    "//base:jni_java",
   ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   java_files = _java_handler_jni_sources
 }
 

components/crash/android/java/src/org/chromium/components/crash/CrashKeys.java

@@ -8,6 +8,7 @@ import androidx.annotation.Nullable;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.NativeMethods;
 
 import java.util.concurrent.atomic.AtomicReferenceArray;
 
@@ -74,7 +75,7 @@ public class CrashKeys {
     public void set(@CrashKeyIndex int keyIndex, @Nullable String value) {
         ThreadUtils.assertOnUiThread();
         if (mFlushed) {
-            nativeSet(keyIndex, value);
+            CrashKeysJni.get().set(CrashKeys.this, keyIndex, value);
             return;
         }
         mValues.set(keyIndex, value);
@@ -90,10 +91,13 @@ public class CrashKeys {
 
         assert !mFlushed;
         for (@CrashKeyIndex int i = 0; i < mValues.length(); i++) {
-            nativeSet(i, mValues.getAndSet(i, null));
+            CrashKeysJni.get().set(CrashKeys.this, i, mValues.getAndSet(i, null));
         }
         mFlushed = true;
     }
 
-    private native void nativeSet(int key, String value);
+    @NativeMethods
+    interface Natives {
+        void set(CrashKeys caller, int key, String value);
+    }
 }

components/crash/android/java/src/org/chromium/components/crash/browser/CrashpadMain.java

@@ -5,6 +5,7 @@
 package org.chromium.components.crash.browser;
 
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 import org.chromium.base.annotations.UsedByReflection;
 import org.chromium.base.library_loader.NativeLibraries;
 
@@ -19,8 +20,11 @@ final class CrashpadMain {
         } catch (UnsatisfiedLinkError e) {
             throw new RuntimeException(e);
         }
-        nativeCrashpadMain(argv);
+        CrashpadMainJni.get().crashpadMain(argv);
     }
 
-    private static native void nativeCrashpadMain(String[] argv);
+    @NativeMethods
+    interface Natives {
+        void crashpadMain(String[] argv);
+    }
 }

components/dom_distiller/content/browser/android/BUILD.gn

@@ -7,9 +7,11 @@ import("//build/config/android/rules.gni")
 android_library("dom_distiller_content_java") {
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//components/dom_distiller/core/android:dom_distiller_core_java",
     "//content/public/android:content_java",
   ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   java_files = [ "java/src/org/chromium/components/dom_distiller/content/DistillablePageUtils.java" ]
 }
 

components/dom_distiller/content/browser/android/java/src/org/chromium/components/dom_distiller/content/DistillablePageUtils.java

@@ -6,6 +6,7 @@ package org.chromium.components.dom_distiller.content;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 import org.chromium.content_public.browser.WebContents;
 
 /**
@@ -30,7 +31,7 @@ public final class DistillablePageUtils {
 
     public static void setDelegate(WebContents webContents,
             PageDistillableDelegate delegate) {
-        nativeSetDelegate(webContents, delegate);
+        DistillablePageUtilsJni.get().setDelegate(webContents, delegate);
     }
 
     @CalledByNative
@@ -41,6 +42,8 @@ public final class DistillablePageUtils {
         }
     }
 
-    private static native void nativeSetDelegate(
-            WebContents webContents, PageDistillableDelegate delegate);
+    @NativeMethods
+    interface Natives {
+        void setDelegate(WebContents webContents, PageDistillableDelegate delegate);
+    }
 }

components/dom_distiller/core/android/BUILD.gn

@@ -7,7 +7,9 @@ import("//build/config/android/rules.gni")
 android_library("dom_distiller_core_java") {
   deps = [
     "//base:base_java",
+    "//base:jni_java",
   ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   java_files = [
     "java/src/org/chromium/components/dom_distiller/core/DomDistillerService.java",
     "java/src/org/chromium/components/dom_distiller/core/DomDistillerUrlUtils.java",

components/dom_distiller/core/android/java/src/org/chromium/components/dom_distiller/core/DistilledPagePrefs.java

@@ -6,6 +6,7 @@ package org.chromium.components.dom_distiller.core;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -31,12 +32,13 @@ public final class DistilledPagePrefs {
     /**
      * Wrapper for dom_distiller::android::DistilledPagePrefsObserverAndroid.
      */
-    private static class DistilledPagePrefsObserverWrapper {
+    static class DistilledPagePrefsObserverWrapper {
         private final Observer mDistilledPagePrefsObserver;
         private final long mNativeDistilledPagePrefsObserverAndroidPtr;
 
         public DistilledPagePrefsObserverWrapper(Observer observer) {
-            mNativeDistilledPagePrefsObserverAndroidPtr = nativeInitObserverAndroid(this);
+            mNativeDistilledPagePrefsObserverAndroidPtr =
+                    DistilledPagePrefsJni.get().initObserverAndroid(this);
             mDistilledPagePrefsObserver = observer;
         }
 
@@ -56,7 +58,8 @@ public final class DistilledPagePrefs {
         }
 
         public void destroy() {
-            nativeDestroyObserverAndroid(mNativeDistilledPagePrefsObserverAndroidPtr);
+            DistilledPagePrefsJni.get().destroyObserverAndroid(
+                    mNativeDistilledPagePrefsObserverAndroidPtr);
         }
 
         public long getNativePtr() {
@@ -65,7 +68,8 @@ public final class DistilledPagePrefs {
     }
 
     DistilledPagePrefs(long distilledPagePrefsPtr) {
-        mDistilledPagePrefsAndroid = nativeInit(distilledPagePrefsPtr);
+        mDistilledPagePrefsAndroid =
+                DistilledPagePrefsJni.get().init(DistilledPagePrefs.this, distilledPagePrefsPtr);
         mObserverMap = new HashMap<Observer, DistilledPagePrefsObserverWrapper>();
     }
 
@@ -77,7 +81,8 @@ public final class DistilledPagePrefs {
         if (mObserverMap.containsKey(obs)) return false;
         DistilledPagePrefsObserverWrapper wrappedObserver =
                 new DistilledPagePrefsObserverWrapper(obs);
-        nativeAddObserver(mDistilledPagePrefsAndroid, wrappedObserver.getNativePtr());
+        DistilledPagePrefsJni.get().addObserver(mDistilledPagePrefsAndroid, DistilledPagePrefs.this,
+                wrappedObserver.getNativePtr());
         mObserverMap.put(obs, wrappedObserver);
         return true;
     }
@@ -89,57 +94,58 @@ public final class DistilledPagePrefs {
     public boolean removeObserver(Observer obs) {
         DistilledPagePrefsObserverWrapper wrappedObserver = mObserverMap.remove(obs);
         if (wrappedObserver == null) return false;
-        nativeRemoveObserver(mDistilledPagePrefsAndroid, wrappedObserver.getNativePtr());
+        DistilledPagePrefsJni.get().removeObserver(mDistilledPagePrefsAndroid,
+                DistilledPagePrefs.this, wrappedObserver.getNativePtr());
         wrappedObserver.destroy();
         return true;
     }
 
     public void setFontFamily(@FontFamily int fontFamily) {
-        nativeSetFontFamily(mDistilledPagePrefsAndroid, fontFamily);
+        DistilledPagePrefsJni.get().setFontFamily(
+                mDistilledPagePrefsAndroid, DistilledPagePrefs.this, fontFamily);
     }
 
     public @FontFamily int getFontFamily() {
-        return nativeGetFontFamily(mDistilledPagePrefsAndroid);
+        return DistilledPagePrefsJni.get().getFontFamily(
+                mDistilledPagePrefsAndroid, DistilledPagePrefs.this);
     }
 
     public void setTheme(@Theme int theme) {
-        nativeSetTheme(mDistilledPagePrefsAndroid, theme);
+        DistilledPagePrefsJni.get().setTheme(
+                mDistilledPagePrefsAndroid, DistilledPagePrefs.this, theme);
     }
 
     public @Theme int getTheme() {
-        return nativeGetTheme(mDistilledPagePrefsAndroid);
+        return DistilledPagePrefsJni.get().getTheme(
+                mDistilledPagePrefsAndroid, DistilledPagePrefs.this);
     }
 
     public void setFontScaling(float scaling) {
-        nativeSetFontScaling(mDistilledPagePrefsAndroid, scaling);
+        DistilledPagePrefsJni.get().setFontScaling(
+                mDistilledPagePrefsAndroid, DistilledPagePrefs.this, scaling);
     }
 
     public float getFontScaling() {
-        return nativeGetFontScaling(mDistilledPagePrefsAndroid);
+        return DistilledPagePrefsJni.get().getFontScaling(
+                mDistilledPagePrefsAndroid, DistilledPagePrefs.this);
     }
 
-    private native long nativeInit(long distilledPagePrefPtr);
-
-    private native void nativeSetFontFamily(long nativeDistilledPagePrefsAndroid, int fontFamily);
-
-    private native int nativeGetFontFamily(long nativeDistilledPagePrefsAndroid);
-
-    private native void nativeSetTheme(long nativeDistilledPagePrefsAndroid, int theme);
-
-    private native int nativeGetTheme(long nativeDistilledPagePrefsAndroid);
-
-    private native void nativeSetFontScaling(long nativeDistilledPagePrefsAndroid, float scaling);
-
-    private native float nativeGetFontScaling(long nativeDistilledPagePrefsAndroid);
-
-    private native void nativeAddObserver(long nativeDistilledPagePrefsAndroid,
-            long nativeObserverPtr);
-
-    private native void nativeRemoveObserver(long nativeDistilledPagePrefsAndroid,
-            long nativeObserverPtr);
-
-    private static native long nativeInitObserverAndroid(DistilledPagePrefsObserverWrapper caller);
-
-    private static native void nativeDestroyObserverAndroid(
-            long nativeDistilledPagePrefsObserverAndroid);
+    @NativeMethods
+    interface Natives {
+        long init(DistilledPagePrefs caller, long distilledPagePrefPtr);
+        void setFontFamily(
+                long nativeDistilledPagePrefsAndroid, DistilledPagePrefs caller, int fontFamily);
+        int getFontFamily(long nativeDistilledPagePrefsAndroid, DistilledPagePrefs caller);
+        void setTheme(long nativeDistilledPagePrefsAndroid, DistilledPagePrefs caller, int theme);
+        int getTheme(long nativeDistilledPagePrefsAndroid, DistilledPagePrefs caller);
+        void setFontScaling(
+                long nativeDistilledPagePrefsAndroid, DistilledPagePrefs caller, float scaling);
+        float getFontScaling(long nativeDistilledPagePrefsAndroid, DistilledPagePrefs caller);
+        void addObserver(long nativeDistilledPagePrefsAndroid, DistilledPagePrefs caller,
+                long nativeObserverPtr);
+        void removeObserver(long nativeDistilledPagePrefsAndroid, DistilledPagePrefs caller,
+                long nativeObserverPtr);
+        long initObserverAndroid(DistilledPagePrefsObserverWrapper caller);
+        void destroyObserverAndroid(long nativeDistilledPagePrefsObserverAndroid);
+    }
 }

components/dom_distiller/core/android/java/src/org/chromium/components/dom_distiller/core/DomDistillerService.java

@@ -7,6 +7,7 @@ package org.chromium.components.dom_distiller.core;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 
 /**
  * Wrapper for native dom_distiller::DomDistillerService.
@@ -20,7 +21,7 @@ public final class DomDistillerService {
     private DomDistillerService(long nativeDomDistillerAndroidServicePtr) {
         mDomDistillerServiceAndroid = nativeDomDistillerAndroidServicePtr;
         mDistilledPagePrefs = new DistilledPagePrefs(
-                nativeGetDistilledPagePrefsPtr(mDomDistillerServiceAndroid));
+                DomDistillerServiceJni.get().getDistilledPagePrefsPtr(mDomDistillerServiceAndroid));
     }
 
     public DistilledPagePrefs getDistilledPagePrefs() {
@@ -28,11 +29,13 @@ public final class DomDistillerService {
     }
 
     public boolean hasEntry(String entryId) {
-        return nativeHasEntry(mDomDistillerServiceAndroid, entryId);
+        return DomDistillerServiceJni.get().hasEntry(
+                mDomDistillerServiceAndroid, DomDistillerService.this, entryId);
     }
 
     public String getUrlForEntry(String entryId) {
-        return nativeGetUrlForEntry(mDomDistillerServiceAndroid, entryId);
+        return DomDistillerServiceJni.get().getUrlForEntry(
+                mDomDistillerServiceAndroid, DomDistillerService.this, entryId);
     }
 
     @CalledByNative
@@ -41,9 +44,12 @@ public final class DomDistillerService {
         return new DomDistillerService(nativeDomDistillerServiceAndroid);
     }
 
-    private native boolean nativeHasEntry(long nativeDomDistillerServiceAndroid, String entryId);
-    private native String nativeGetUrlForEntry(
-            long nativeDomDistillerServiceAndroid, String entryId);
-    private static native long nativeGetDistilledPagePrefsPtr(
-            long nativeDomDistillerServiceAndroid);
+    @NativeMethods
+    interface Natives {
+        boolean hasEntry(
+                long nativeDomDistillerServiceAndroid, DomDistillerService caller, String entryId);
+        String getUrlForEntry(
+                long nativeDomDistillerServiceAndroid, DomDistillerService caller, String entryId);
+        long getDistilledPagePrefsPtr(long nativeDomDistillerServiceAndroid);
+    }
 }

components/dom_distiller/core/android/java/src/org/chromium/components/dom_distiller/core/DomDistillerUrlUtils.java

@@ -8,6 +8,7 @@ import android.text.TextUtils;
 
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 
 /**
  * Wrapper for the dom_distiller::url_utils.
@@ -28,7 +29,7 @@ public final class DomDistillerUrlUtils {
     public static String getDistillerViewUrlFromUrl(String scheme, String url) {
         assert scheme != null;
         if (TextUtils.isEmpty(url)) return url;
-        return nativeGetDistillerViewUrlFromUrl(scheme, url);
+        return DomDistillerUrlUtilsJni.get().getDistillerViewUrlFromUrl(scheme, url);
     }
 
     /**
@@ -39,7 +40,7 @@ public final class DomDistillerUrlUtils {
      */
     public static String getOriginalUrlFromDistillerUrl(String url) {
         if (TextUtils.isEmpty(url)) return url;
-        return nativeGetOriginalUrlFromDistillerUrl(url);
+        return DomDistillerUrlUtilsJni.get().getOriginalUrlFromDistillerUrl(url);
     }
 
     /**
@@ -50,17 +51,20 @@ public final class DomDistillerUrlUtils {
      */
     public static boolean isDistilledPage(String url) {
         if (TextUtils.isEmpty(url)) return false;
-        return nativeIsDistilledPage(url);
+        return DomDistillerUrlUtilsJni.get().isDistilledPage(url);
     }
 
     public static String getValueForKeyInUrl(String url, String key) {
         assert key != null;
         if (TextUtils.isEmpty(url)) return null;
-        return nativeGetValueForKeyInUrl(url, key);
+        return DomDistillerUrlUtilsJni.get().getValueForKeyInUrl(url, key);
     }
 
-    private static native String nativeGetDistillerViewUrlFromUrl(String scheme, String url);
-    private static native String nativeGetOriginalUrlFromDistillerUrl(String viewerUrl);
-    private static native boolean nativeIsDistilledPage(String url);
-    private static native String nativeGetValueForKeyInUrl(String url, String key);
+    @NativeMethods
+    interface Natives {
+        String getDistillerViewUrlFromUrl(String scheme, String url);
+        String getOriginalUrlFromDistillerUrl(String viewerUrl);
+        boolean isDistilledPage(String url);
+        String getValueForKeyInUrl(String url, String key);
+    }
 }

components/download/internal/common/BUILD.gn

@@ -105,7 +105,9 @@ if (is_android) {
 
     deps = [
       "//base:base_java",
+      "//base:jni_java",
     ]
+    annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   }
 
   generate_jni("jni_headers") {

components/download/internal/common/android/java/src/org/chromium/components/download/DownloadCollectionBridge.java

@@ -12,6 +12,7 @@ import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 
 /**
  * Helper class for publishing download files to the public download collection.
@@ -296,7 +297,7 @@ public class DownloadCollectionBridge {
      * @return number of days for an intermediate download to expire.
      */
     public static int getExpirationDurationInDays() {
-        return nativeGetExpirationDurationInDays();
+        return DownloadCollectionBridgeJni.get().getExpirationDurationInDays();
     }
 
     /**
@@ -309,5 +310,8 @@ public class DownloadCollectionBridge {
         return getDownloadCollectionBridge().getDisplayNameForUri(downloadUri);
     }
 
-    private static native int nativeGetExpirationDurationInDays();
+    @NativeMethods
+    interface Natives {
+        int getExpirationDurationInDays();
+    }
 }

components/download/network/BUILD.gn

@@ -44,8 +44,10 @@ if (is_android) {
 
     deps = [
       "//base:base_java",
+      "//base:jni_java",
       "//net/android:net_java",
     ]
+    annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   }
 
   generate_jni("jni_headers") {

components/download/network/android/java/src/org/chromium/components/download/NetworkStatusListenerAndroid.java

@@ -7,6 +7,7 @@ package org.chromium.components.download;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 import org.chromium.net.NetworkChangeNotifierAutoDetect;
 import org.chromium.net.NetworkChangeNotifierAutoDetect.Observer;
 import org.chromium.net.RegistrationPolicyAlwaysRegister;
@@ -59,7 +60,8 @@ public final class NetworkStatusListenerAndroid implements Observer {
     @Override
     public void onConnectionTypeChanged(int newConnectionType) {
         if (mNativePtr != 0) {
-            nativeNotifyNetworkChange(mNativePtr, newConnectionType);
+            NetworkStatusListenerAndroidJni.get().notifyNetworkChange(
+                    mNativePtr, NetworkStatusListenerAndroid.this, newConnectionType);
         }
     }
 
@@ -87,6 +89,9 @@ public final class NetworkStatusListenerAndroid implements Observer {
     @Override
     public void purgeActiveNetworkList(long[] activeNetIds) {}
 
-    private native void nativeNotifyNetworkChange(
-            long nativeNetworkStatusListenerAndroid, int connectionType);
+    @NativeMethods
+    interface Natives {
+        void notifyNetworkChange(long nativeNetworkStatusListenerAndroid,
+                NetworkStatusListenerAndroid caller, int connectionType);
+    }
 }

components/embedder_support/android/BUILD.gn

@@ -42,9 +42,11 @@ android_library("content_view_java") {
 android_library("view_java") {
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//content/public/android:content_java",
     "//ui/android:ui_java",
   ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   java_files = [ "java/src/org/chromium/components/embedder_support/view/ContentViewRenderView.java" ]
 }
 
@@ -147,10 +149,12 @@ android_library("web_contents_delegate_java") {
   deps = [
     ":web_contents_delegate_java_resources",
     "//base:base_java",
+    "//base:jni_java",
     "//content/public/android:content_java",
     "//third_party/android_deps:com_android_support_support_compat_java",
     "//ui/android:ui_java",
   ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   java_files = [
     "java/src/org/chromium/components/embedder_support/delegate/ColorChooserAndroid.java",
     "java/src/org/chromium/components/embedder_support/delegate/ColorPickerAdvanced.java",

components/embedder_support/android/java/src/org/chromium/components/embedder_support/delegate/ColorChooserAndroid.java

@@ -9,6 +9,7 @@ import android.content.Context;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 import org.chromium.ui.base.WindowAndroid;
 
 /**
@@ -26,7 +27,8 @@ public class ColorChooserAndroid {
             @Override
             public void onColorChanged(int color) {
                 mDialog.dismiss();
-                nativeOnColorChosen(mNativeColorChooserAndroid, color);
+                ColorChooserAndroidJni.get().onColorChosen(
+                        mNativeColorChooserAndroid, ColorChooserAndroid.this, color);
             }
         };
 
@@ -72,6 +74,9 @@ public class ColorChooserAndroid {
         array[index] = new ColorSuggestion(color, label);
     }
 
-    // Implemented in color_chooser_android.cc
-    private native void nativeOnColorChosen(long nativeColorChooserAndroid, int color);
+    @NativeMethods
+    interface Natives {
+        // Implemented in color_chooser_android.cc
+        void onColorChosen(long nativeColorChooserAndroid, ColorChooserAndroid caller, int color);
+    }
 }

components/embedder_support/android/java/src/org/chromium/components/embedder_support/view/ContentViewRenderView.java

@@ -15,6 +15,7 @@ import android.widget.FrameLayout;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.ui.base.WindowAndroid;
 
@@ -66,25 +67,28 @@ public class ContentViewRenderView extends FrameLayout {
         assert !mSurfaceView.getHolder().getSurface().isValid()
             : "Surface created before native library loaded.";
         assert rootWindow != null;
-        mNativeContentViewRenderView = nativeInit(rootWindow);
+        mNativeContentViewRenderView =
+                ContentViewRenderViewJni.get().init(ContentViewRenderView.this, rootWindow);
         assert mNativeContentViewRenderView != 0;
         mWindowAndroid = rootWindow;
         mSurfaceCallback = new SurfaceHolder.Callback() {
             @Override
             public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
                 assert mNativeContentViewRenderView != 0;
-                nativeSurfaceChanged(
-                        mNativeContentViewRenderView, format, width, height, holder.getSurface());
+                ContentViewRenderViewJni.get().surfaceChanged(mNativeContentViewRenderView,
+                        ContentViewRenderView.this, format, width, height, holder.getSurface());
                 if (mWebContents != null) {
-                    nativeOnPhysicalBackingSizeChanged(
-                            mNativeContentViewRenderView, mWebContents, width, height);
+                    ContentViewRenderViewJni.get().onPhysicalBackingSizeChanged(
+                            mNativeContentViewRenderView, ContentViewRenderView.this, mWebContents,
+                            width, height);
                 }
             }
 
             @Override
             public void surfaceCreated(SurfaceHolder holder) {
                 assert mNativeContentViewRenderView != 0;
-                nativeSurfaceCreated(mNativeContentViewRenderView);
+                ContentViewRenderViewJni.get().surfaceCreated(
+                        mNativeContentViewRenderView, ContentViewRenderView.this);
 
                 // On pre-M Android, layers start in the hidden state until a relayout happens.
                 // There is a bug that manifests itself when entering overlay mode on pre-M devices,
@@ -99,7 +103,8 @@ public class ContentViewRenderView extends FrameLayout {
             @Override
             public void surfaceDestroyed(SurfaceHolder holder) {
                 assert mNativeContentViewRenderView != 0;
-                nativeSurfaceDestroyed(mNativeContentViewRenderView);
+                ContentViewRenderViewJni.get().surfaceDestroyed(
+                        mNativeContentViewRenderView, ContentViewRenderView.this);
             }
         };
         mSurfaceView.getHolder().addCallback(mSurfaceCallback);
@@ -155,7 +160,8 @@ public class ContentViewRenderView extends FrameLayout {
     public void destroy() {
         mSurfaceView.getHolder().removeCallback(mSurfaceCallback);
         mWindowAndroid = null;
-        nativeDestroy(mNativeContentViewRenderView);
+        ContentViewRenderViewJni.get().destroy(
+                mNativeContentViewRenderView, ContentViewRenderView.this);
         mNativeContentViewRenderView = 0;
     }
 
@@ -165,10 +171,12 @@ public class ContentViewRenderView extends FrameLayout {
 
         if (webContents != null) {
             webContents.setSize(mWidth, mHeight);
-            nativeOnPhysicalBackingSizeChanged(
-                    mNativeContentViewRenderView, webContents, mWidth, mHeight);
+            ContentViewRenderViewJni.get().onPhysicalBackingSizeChanged(
+                    mNativeContentViewRenderView, ContentViewRenderView.this, webContents, mWidth,
+                    mHeight);
         }
-        nativeSetCurrentWebContents(mNativeContentViewRenderView, webContents);
+        ContentViewRenderViewJni.get().setCurrentWebContents(
+                mNativeContentViewRenderView, ContentViewRenderView.this, webContents);
     }
 
     /**
@@ -201,7 +209,8 @@ public class ContentViewRenderView extends FrameLayout {
     public void setOverlayVideoMode(boolean enabled) {
         int format = enabled ? PixelFormat.TRANSLUCENT : PixelFormat.OPAQUE;
         mSurfaceView.getHolder().setFormat(format);
-        nativeSetOverlayVideoMode(mNativeContentViewRenderView, enabled);
+        ContentViewRenderViewJni.get().setOverlayVideoMode(
+                mNativeContentViewRenderView, ContentViewRenderView.this, enabled);
     }
 
     @CalledByNative
@@ -216,16 +225,19 @@ public class ContentViewRenderView extends FrameLayout {
         }
     }
 
-    private native long nativeInit(WindowAndroid rootWindow);
-    private native void nativeDestroy(long nativeContentViewRenderView);
-    private native void nativeSetCurrentWebContents(
-            long nativeContentViewRenderView, WebContents webContents);
-    private native void nativeOnPhysicalBackingSizeChanged(
-            long nativeContentViewRenderView, WebContents webContents, int width, int height);
-    private native void nativeSurfaceCreated(long nativeContentViewRenderView);
-    private native void nativeSurfaceDestroyed(long nativeContentViewRenderView);
-    private native void nativeSurfaceChanged(
-            long nativeContentViewRenderView, int format, int width, int height, Surface surface);
-    private native void nativeSetOverlayVideoMode(
-            long nativeContentViewRenderView, boolean enabled);
+    @NativeMethods
+    interface Natives {
+        long init(ContentViewRenderView caller, WindowAndroid rootWindow);
+        void destroy(long nativeContentViewRenderView, ContentViewRenderView caller);
+        void setCurrentWebContents(long nativeContentViewRenderView, ContentViewRenderView caller,
+                WebContents webContents);
+        void onPhysicalBackingSizeChanged(long nativeContentViewRenderView,
+                ContentViewRenderView caller, WebContents webContents, int width, int height);
+        void surfaceCreated(long nativeContentViewRenderView, ContentViewRenderView caller);
+        void surfaceDestroyed(long nativeContentViewRenderView, ContentViewRenderView caller);
+        void surfaceChanged(long nativeContentViewRenderView, ContentViewRenderView caller,
+                int format, int width, int height, Surface surface);
+        void setOverlayVideoMode(
+                long nativeContentViewRenderView, ContentViewRenderView caller, boolean enabled);
+    }
 }

components/feature_engagement/internal/BUILD.gn

@@ -137,10 +137,12 @@ if (is_android) {
 
     deps = [
       "//base:base_java",
+      "//base:jni_java",
       "//components/feature_engagement/public:public_java",
       "//third_party/android_deps:androidx_annotation_annotation_java",
       "//ui/android:ui_java",
     ]
+    annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   }
 
   generate_jni("jni_headers") {

components/feature_engagement/internal/android/java/src/org/chromium/components/feature_engagement/internal/TrackerImpl.java

@@ -11,6 +11,7 @@ import org.chromium.base.Callback;
 import org.chromium.base.CommandLine;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 import org.chromium.components.feature_engagement.Tracker;
 import org.chromium.components.feature_engagement.TriggerState;
 import org.chromium.ui.UiSwitches;
@@ -25,7 +26,7 @@ public class TrackerImpl implements Tracker {
      * A JNI-wrapper for the native DisplayLockHandle.
      * The C++ counterpart is DisplayLockHandleAndroid.
      */
-    private static class DisplayLockHandleAndroid implements DisplayLockHandle {
+    static class DisplayLockHandleAndroid implements DisplayLockHandle {
         @CalledByNative("DisplayLockHandleAndroid")
         private static DisplayLockHandleAndroid create(long nativePtr) {
             return new DisplayLockHandleAndroid(nativePtr);
@@ -45,7 +46,7 @@ public class TrackerImpl implements Tracker {
         @Override
         public void release() {
             assert mNativePtr != 0;
-            nativeRelease(mNativePtr);
+            TrackerImplJni.get().release(mNativePtr);
             assert mNativePtr == 0;
         }
     }
@@ -67,7 +68,7 @@ public class TrackerImpl implements Tracker {
     @Override
     public void notifyEvent(String event) {
         assert mNativePtr != 0;
-        nativeNotifyEvent(mNativePtr, event);
+        TrackerImplJni.get().notifyEvent(mNativePtr, TrackerImpl.this, event);
     }
 
     @Override
@@ -78,26 +79,26 @@ public class TrackerImpl implements Tracker {
         }
 
         assert mNativePtr != 0;
-        return nativeShouldTriggerHelpUI(mNativePtr, feature);
+        return TrackerImplJni.get().shouldTriggerHelpUI(mNativePtr, TrackerImpl.this, feature);
     }
 
     @Override
     public boolean wouldTriggerHelpUI(String feature) {
         assert mNativePtr != 0;
-        return nativeWouldTriggerHelpUI(mNativePtr, feature);
+        return TrackerImplJni.get().wouldTriggerHelpUI(mNativePtr, TrackerImpl.this, feature);
     }
 
     @Override
     @TriggerState
     public int getTriggerState(String feature) {
         assert mNativePtr != 0;
-        return nativeGetTriggerState(mNativePtr, feature);
+        return TrackerImplJni.get().getTriggerState(mNativePtr, TrackerImpl.this, feature);
     }
 
     @Override
     public void dismissed(String feature) {
         assert mNativePtr != 0;
-        nativeDismissed(mNativePtr, feature);
+        TrackerImplJni.get().dismissed(mNativePtr, TrackerImpl.this, feature);
     }
 
     @Override
@@ -105,19 +106,19 @@ public class TrackerImpl implements Tracker {
     @Nullable
     public DisplayLockHandle acquireDisplayLock() {
         assert mNativePtr != 0;
-        return nativeAcquireDisplayLock(mNativePtr);
+        return TrackerImplJni.get().acquireDisplayLock(mNativePtr, TrackerImpl.this);
     }
 
     @Override
     public boolean isInitialized() {
         assert mNativePtr != 0;
-        return nativeIsInitialized(mNativePtr);
+        return TrackerImplJni.get().isInitialized(mNativePtr, TrackerImpl.this);
     }
 
     @Override
     public void addOnInitializedCallback(Callback<Boolean> callback) {
         assert mNativePtr != 0;
-        nativeAddOnInitializedCallback(mNativePtr, callback);
+        TrackerImplJni.get().addOnInitializedCallback(mNativePtr, TrackerImpl.this, callback);
     }
 
     @CalledByNative
@@ -131,15 +132,20 @@ public class TrackerImpl implements Tracker {
         return mNativePtr;
     }
 
-    private native void nativeNotifyEvent(long nativeTrackerImplAndroid, String event);
-    private native boolean nativeShouldTriggerHelpUI(long nativeTrackerImplAndroid, String feature);
-    private native boolean nativeWouldTriggerHelpUI(long nativeTrackerImplAndroid, String feature);
-    @TriggerState
-    private native int nativeGetTriggerState(long nativeTrackerImplAndroid, String feature);
-    private native void nativeDismissed(long nativeTrackerImplAndroid, String feature);
-    private native DisplayLockHandleAndroid nativeAcquireDisplayLock(long nativeTrackerImplAndroid);
-    private native boolean nativeIsInitialized(long nativeTrackerImplAndroid);
-    private native void nativeAddOnInitializedCallback(
-            long nativeTrackerImplAndroid, Callback<Boolean> callback);
-    private static native void nativeRelease(long nativeDisplayLockHandleAndroid);
+    @NativeMethods
+    interface Natives {
+        void notifyEvent(long nativeTrackerImplAndroid, TrackerImpl caller, String event);
+        boolean shouldTriggerHelpUI(
+                long nativeTrackerImplAndroid, TrackerImpl caller, String feature);
+        boolean wouldTriggerHelpUI(
+                long nativeTrackerImplAndroid, TrackerImpl caller, String feature);
+        int getTriggerState(long nativeTrackerImplAndroid, TrackerImpl caller, String feature);
+        void dismissed(long nativeTrackerImplAndroid, TrackerImpl caller, String feature);
+        DisplayLockHandleAndroid acquireDisplayLock(
+                long nativeTrackerImplAndroid, TrackerImpl caller);
+        boolean isInitialized(long nativeTrackerImplAndroid, TrackerImpl caller);
+        void addOnInitializedCallback(
+                long nativeTrackerImplAndroid, TrackerImpl caller, Callback<Boolean> callback);
+        void release(long nativeDisplayLockHandleAndroid);
+    }
 }

components/gcm_driver/android/BUILD.gn

@@ -13,10 +13,12 @@ generate_jni("jni_headers") {
 android_library("gcm_driver_java") {
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//content/public/android:content_java",
     "//third_party/android_sdk:android_gcm_java",
     "//third_party/jsr-305:jsr_305_javalib",
   ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 
   java_files = [
     "java/src/org/chromium/components/gcm_driver/GCMDriver.java",

components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GCMDriver.java

@@ -11,6 +11,7 @@ import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.task.AsyncTask;
 import org.chromium.base.task.PostTask;
@@ -112,8 +113,8 @@ public class GCMDriver {
             }
             @Override
             protected void onPostExecute(String registrationId) {
-                nativeOnRegisterFinished(mNativeGCMDriverAndroid, appId, registrationId,
-                                         !registrationId.isEmpty());
+                GCMDriverJni.get().onRegisterFinished(mNativeGCMDriverAndroid, GCMDriver.this,
+                        appId, registrationId, !registrationId.isEmpty());
             }
         }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
     }
@@ -135,7 +136,8 @@ public class GCMDriver {
 
             @Override
             protected void onPostExecute(Boolean success) {
-                nativeOnUnregisterFinished(mNativeGCMDriverAndroid, appId, success);
+                GCMDriverJni.get().onUnregisterFinished(
+                        mNativeGCMDriverAndroid, GCMDriver.this, appId, success);
             }
         }
                 .executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
@@ -149,9 +151,10 @@ public class GCMDriver {
             throw new RuntimeException("Failed to instantiate GCMDriver.");
         }
 
-        sInstance.nativeOnMessageReceived(sInstance.mNativeGCMDriverAndroid, message.getAppId(),
-                message.getSenderId(), message.getMessageId(), message.getCollapseKey(),
-                message.getRawData(), message.getDataKeysAndValuesArray());
+        GCMDriverJni.get().onMessageReceived(sInstance.mNativeGCMDriverAndroid, sInstance,
+                message.getAppId(), message.getSenderId(), message.getMessageId(),
+                message.getCollapseKey(), message.getRawData(),
+                message.getDataKeysAndValuesArray());
     }
 
     @VisibleForTesting
@@ -161,11 +164,14 @@ public class GCMDriver {
         sInstance.mSubscriber = subscriber;
     }
 
-    private native void nativeOnRegisterFinished(long nativeGCMDriverAndroid, String appId,
-            String registrationId, boolean success);
-    private native void nativeOnUnregisterFinished(long nativeGCMDriverAndroid, String appId,
-            boolean success);
-    private native void nativeOnMessageReceived(long nativeGCMDriverAndroid, String appId,
-            String senderId, String messageId, String collapseKey, byte[] rawData,
-            String[] dataKeysAndValues);
+    @NativeMethods
+    interface Natives {
+        void onRegisterFinished(long nativeGCMDriverAndroid, GCMDriver caller, String appId,
+                String registrationId, boolean success);
+        void onUnregisterFinished(
+                long nativeGCMDriverAndroid, GCMDriver caller, String appId, boolean success);
+        void onMessageReceived(long nativeGCMDriverAndroid, GCMDriver caller, String appId,
+                String senderId, String messageId, String collapseKey, byte[] rawData,
+                String[] dataKeysAndValues);
+    }
 }

components/gcm_driver/instance_id/android/BUILD.gn

@@ -20,8 +20,10 @@ android_library("instance_id_driver_java") {
   deps = [
     "$google_play_services_package:google_play_services_iid_java",
     "//base:base_java",
+    "//base:jni_java",
     "//components/gcm_driver/android:gcm_driver_java",
   ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 
   srcjar_deps =
       [ "//components/gcm_driver/instance_id:instance_id_java_enums_srcjar" ]

components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java

@@ -8,6 +8,7 @@ import android.os.Bundle;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 import org.chromium.base.task.AsyncTask;
 import org.chromium.components.gcm_driver.InstanceIDFlags;
 import org.chromium.components.gcm_driver.LazySubscriptionsManager;
@@ -77,7 +78,8 @@ public class InstanceIDBridge {
             }
             @Override
             protected void sendResultToNative(String id) {
-                nativeDidGetID(mNativeInstanceIDAndroid, requestId, id);
+                InstanceIDBridgeJni.get().didGetID(
+                        mNativeInstanceIDAndroid, InstanceIDBridge.this, requestId, id);
             }
         }.execute();
     }
@@ -92,7 +94,8 @@ public class InstanceIDBridge {
             }
             @Override
             protected void sendResultToNative(Long creationTime) {
-                nativeDidGetCreationTime(mNativeInstanceIDAndroid, requestId, creationTime);
+                InstanceIDBridgeJni.get().didGetCreationTime(
+                        mNativeInstanceIDAndroid, InstanceIDBridge.this, requestId, creationTime);
             }
         }.execute();
     }
@@ -131,7 +134,8 @@ public class InstanceIDBridge {
             }
             @Override
             protected void sendResultToNative(String token) {
-                nativeDidGetToken(mNativeInstanceIDAndroid, requestId, token);
+                InstanceIDBridgeJni.get().didGetToken(
+                        mNativeInstanceIDAndroid, InstanceIDBridge.this, requestId, token);
             }
         }.execute();
     }
@@ -161,7 +165,8 @@ public class InstanceIDBridge {
             }
             @Override
             protected void sendResultToNative(Boolean success) {
-                nativeDidDeleteToken(mNativeInstanceIDAndroid, requestId, success);
+                InstanceIDBridgeJni.get().didDeleteToken(
+                        mNativeInstanceIDAndroid, InstanceIDBridge.this, requestId, success);
             }
         }.execute();
     }
@@ -181,21 +186,12 @@ public class InstanceIDBridge {
             }
             @Override
             protected void sendResultToNative(Boolean success) {
-                nativeDidDeleteID(mNativeInstanceIDAndroid, requestId, success);
+                InstanceIDBridgeJni.get().didDeleteID(
+                        mNativeInstanceIDAndroid, InstanceIDBridge.this, requestId, success);
             }
         }.execute();
     }
 
-    private native void nativeDidGetID(long nativeInstanceIDAndroid, int requestId, String id);
-    private native void nativeDidGetCreationTime(
-            long nativeInstanceIDAndroid, int requestId, long creationTime);
-    private native void nativeDidGetToken(
-            long nativeInstanceIDAndroid, int requestId, String token);
-    private native void nativeDidDeleteToken(
-            long nativeInstanceIDAndroid, int requestId, boolean success);
-    private native void nativeDidDeleteID(
-            long nativeInstanceIDAndroid, int requestId, boolean success);
-
     /**
      * Custom {@link AsyncTask} wrapper. As usual, this performs work on a background thread, then
      * sends the result back on the UI thread. Key differences:
@@ -243,4 +239,18 @@ public class InstanceIDBridge {
             }
         }
     }
+
+    @NativeMethods
+    interface Natives {
+        void didGetID(
+                long nativeInstanceIDAndroid, InstanceIDBridge caller, int requestId, String id);
+        void didGetCreationTime(long nativeInstanceIDAndroid, InstanceIDBridge caller,
+                int requestId, long creationTime);
+        void didGetToken(
+                long nativeInstanceIDAndroid, InstanceIDBridge caller, int requestId, String token);
+        void didDeleteToken(long nativeInstanceIDAndroid, InstanceIDBridge caller, int requestId,
+                boolean success);
+        void didDeleteID(long nativeInstanceIDAndroid, InstanceIDBridge caller, int requestId,
+                boolean success);
+    }
 }

components/invalidation/impl/BUILD.gn

@@ -238,6 +238,7 @@ if (is_android) {
     deps = [
       ":proto_java",
       "//base:base_java",
+      "//base:jni_java",
       "//components/signin/core/browser/android:java",
       "//components/sync/android:sync_java",
       "//third_party/android_deps:com_google_protobuf_protobuf_lite_java",
@@ -245,6 +246,7 @@ if (is_android) {
       "//third_party/cacheinvalidation:cacheinvalidation_proto_java",
       "//third_party/jsr-305:jsr_305_javalib",
     ]
+    annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
     java_files = [
       "android/java/src/org/chromium/components/invalidation/InvalidationClientService.java",
       "android/java/src/org/chromium/components/invalidation/InvalidationService.java",

components/invalidation/impl/android/java/src/org/chromium/components/invalidation/InvalidationService.java

@@ -16,6 +16,7 @@ import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 import org.chromium.components.sync.notifier.InvalidationClientNameProvider;
 import org.chromium.components.sync.notifier.InvalidationIntentProtocol;
 import org.chromium.components.sync.notifier.InvalidationPreferences;
@@ -38,8 +39,8 @@ public class InvalidationService {
     public void notifyInvalidationToNativeChrome(
             int objectSource, String objectId, long version, String payload) {
         ThreadUtils.assertOnUiThread();
-        nativeInvalidate(
-                mNativeInvalidationServiceAndroid, objectSource, objectId, version, payload);
+        InvalidationServiceJni.get().invalidate(mNativeInvalidationServiceAndroid,
+                InvalidationService.this, objectSource, objectId, version, payload);
     }
 
     public void requestSyncFromNativeChromeForAllTypes() {
@@ -97,6 +98,9 @@ public class InvalidationService {
         return InvalidationClientNameProvider.get().getInvalidatorClientName();
     }
 
-    private native void nativeInvalidate(long nativeInvalidationServiceAndroid, int objectSource,
-            String objectId, long version, String payload);
+    @NativeMethods
+    interface Natives {
+        void invalidate(long nativeInvalidationServiceAndroid, InvalidationService caller,
+                int objectSource, String objectId, long version, String payload);
+    }
 }

components/language/android/BUILD.gn

@@ -32,5 +32,7 @@ android_library("language_bridge_java") {
 
   deps = [
     "//base:base_java",
+    "//base:jni_java",
   ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }

components/language/android/java/src/org/chromium/components/language/AndroidLanguageMetricsBridge.java

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 package org.chromium.components.language;
+import org.chromium.base.annotations.NativeMethods;
 
 /**
  * A bridge to language metrics functions that require access to native code.
@@ -15,9 +16,12 @@ public class AndroidLanguageMetricsBridge {
      * @param added True if the language was added, false if it was removed.
      */
     public static void reportExplicitLanguageAskStateChanged(String language, boolean added) {
-        nativeReportExplicitLanguageAskStateChanged(language, added);
+        AndroidLanguageMetricsBridgeJni.get().reportExplicitLanguageAskStateChanged(
+                language, added);
     }
 
-    private static native void nativeReportExplicitLanguageAskStateChanged(
-            String language, boolean added);
+    @NativeMethods
+    interface Natives {
+        void reportExplicitLanguageAskStateChanged(String language, boolean added);
+    }
 }

components/language/android/java/src/org/chromium/components/language/GeoLanguageProviderBridge.java

@@ -5,6 +5,7 @@
 package org.chromium.components.language;
 
 import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.NativeMethods;
 
 import java.util.LinkedHashSet;
 
@@ -19,7 +20,7 @@ public class GeoLanguageProviderBridge {
      */
     public static LinkedHashSet<String> getCurrentGeoLanguages() {
         LinkedHashSet<String> set = new LinkedHashSet<String>();
-        nativeGetCurrentGeoLanguages(set);
+        GeoLanguageProviderBridgeJni.get().getCurrentGeoLanguages(set);
         return set;
     }
 
@@ -28,5 +29,8 @@ public class GeoLanguageProviderBridge {
         languages.add(languageCode);
     }
 
-    private static native void nativeGetCurrentGeoLanguages(LinkedHashSet<String> set);
+    @NativeMethods
+    interface Natives {
+        void getCurrentGeoLanguages(LinkedHashSet<String> set);
+    }
 }

components/minidump_uploader/BUILD.gn

@@ -29,6 +29,7 @@ static_library("minidump_uploader") {
 android_library("minidump_uploader_java") {
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
 
@@ -45,6 +46,7 @@ android_library("minidump_uploader_java") {
     "android/java/src/org/chromium/components/minidump_uploader/util/HttpURLConnectionFactoryImpl.java",
     "android/java/src/org/chromium/components/minidump_uploader/util/NetworkPermissionUtil.java",
   ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }
 
 android_library("minidump_uploader_javatests") {

components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/CrashReportMimeWriter.java

@@ -5,6 +5,7 @@
 package org.chromium.components.minidump_uploader;
 
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 
 import java.io.File;
 import java.util.HashMap;
@@ -27,7 +28,8 @@ public class CrashReportMimeWriter {
      * @param destDir The directory in which to write the MIME files.
      */
     public static void rewriteMinidumpsAsMIMEs(File srcDir, File destDir) {
-        nativeRewriteMinidumpsAsMIMEs(srcDir.getAbsolutePath(), destDir.getAbsolutePath());
+        CrashReportMimeWriterJni.get().rewriteMinidumpsAsMIMEs(
+                srcDir.getAbsolutePath(), destDir.getAbsolutePath());
     }
 
     /*
@@ -41,8 +43,9 @@ public class CrashReportMimeWriter {
      */
     public static Map<String, Map<String, String>> rewriteMinidumpsAsMIMEsAndGetCrashKeys(
             File srcDir, File destDir) {
-        String[] crashesKeyValueArr = nativeRewriteMinidumpsAsMIMEsAndGetCrashKeys(
-                srcDir.getAbsolutePath(), destDir.getAbsolutePath());
+        String[] crashesKeyValueArr =
+                CrashReportMimeWriterJni.get().rewriteMinidumpsAsMIMEsAndGetCrashKeys(
+                        srcDir.getAbsolutePath(), destDir.getAbsolutePath());
         Map<String, Map<String, String>> crashesInfoMap = new HashMap<>();
         Map<String, String> lastCrashInfo = new HashMap<>();
         // Keys and values for all crash files are flattened in a String array. Each key is followed
@@ -65,7 +68,9 @@ public class CrashReportMimeWriter {
         return crashesInfoMap;
     }
 
-    private static native void nativeRewriteMinidumpsAsMIMEs(String srcDir, String destDir);
-    private static native String[] nativeRewriteMinidumpsAsMIMEsAndGetCrashKeys(
-            String srcDir, String destDir);
+    @NativeMethods
+    interface Natives {
+        void rewriteMinidumpsAsMIMEs(String srcDir, String destDir);
+        String[] rewriteMinidumpsAsMIMEsAndGetCrashKeys(String srcDir, String destDir);
+    }
 }

components/offline_items_collection/core/BUILD.gn

@@ -91,11 +91,13 @@ if (is_android) {
       "android/java/src/org/chromium/components/offline_items_collection/UpdateDelta.java",
       "android/java/src/org/chromium/components/offline_items_collection/VisualsCallback.java",
     ]
+    annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 
     srcjar_deps = [ ":jni_enums" ]
 
     deps = [
       "//base:base_java",
+      "//base:jni_java",
       "//third_party/android_deps:androidx_annotation_annotation_java",
     ]
   }

components/offline_items_collection/core/android/java/src/org/chromium/components/offline_items_collection/OfflineContentAggregatorBridge.java

@@ -10,6 +10,7 @@ import org.chromium.base.Callback;
 import org.chromium.base.ObserverList;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 
 import java.util.ArrayList;
 
@@ -40,62 +41,72 @@ public class OfflineContentAggregatorBridge implements OfflineContentProvider {
     @Override
     public void openItem(@LaunchLocation int location, ContentId id) {
         if (mNativeOfflineContentAggregatorBridge == 0) return;
-        nativeOpenItem(mNativeOfflineContentAggregatorBridge, location, id.namespace, id.id);
+        OfflineContentAggregatorBridgeJni.get().openItem(mNativeOfflineContentAggregatorBridge,
+                OfflineContentAggregatorBridge.this, location, id.namespace, id.id);
     }
 
     @Override
     public void removeItem(ContentId id) {
         if (mNativeOfflineContentAggregatorBridge == 0) return;
-        nativeRemoveItem(mNativeOfflineContentAggregatorBridge, id.namespace, id.id);
+        OfflineContentAggregatorBridgeJni.get().removeItem(mNativeOfflineContentAggregatorBridge,
+                OfflineContentAggregatorBridge.this, id.namespace, id.id);
     }
 
     @Override
     public void cancelDownload(ContentId id) {
         if (mNativeOfflineContentAggregatorBridge == 0) return;
-        nativeCancelDownload(mNativeOfflineContentAggregatorBridge, id.namespace, id.id);
+        OfflineContentAggregatorBridgeJni.get().cancelDownload(
+                mNativeOfflineContentAggregatorBridge, OfflineContentAggregatorBridge.this,
+                id.namespace, id.id);
     }
 
     @Override
     public void pauseDownload(ContentId id) {
         if (mNativeOfflineContentAggregatorBridge == 0) return;
-        nativePauseDownload(mNativeOfflineContentAggregatorBridge, id.namespace, id.id);
+        OfflineContentAggregatorBridgeJni.get().pauseDownload(mNativeOfflineContentAggregatorBridge,
+                OfflineContentAggregatorBridge.this, id.namespace, id.id);
     }
 
     @Override
     public void resumeDownload(ContentId id, boolean hasUserGesture) {
         if (mNativeOfflineContentAggregatorBridge == 0) return;
-        nativeResumeDownload(
-                mNativeOfflineContentAggregatorBridge, id.namespace, id.id, hasUserGesture);
+        OfflineContentAggregatorBridgeJni.get().resumeDownload(
+                mNativeOfflineContentAggregatorBridge, OfflineContentAggregatorBridge.this,
+                id.namespace, id.id, hasUserGesture);
     }
 
     @Override
     public void getItemById(ContentId id, Callback<OfflineItem> callback) {
         if (mNativeOfflineContentAggregatorBridge == 0) return;
-        nativeGetItemById(mNativeOfflineContentAggregatorBridge, id.namespace, id.id, callback);
+        OfflineContentAggregatorBridgeJni.get().getItemById(mNativeOfflineContentAggregatorBridge,
+                OfflineContentAggregatorBridge.this, id.namespace, id.id, callback);
     }
 
     @Override
     public void getAllItems(Callback<ArrayList<OfflineItem>> callback) {
         if (mNativeOfflineContentAggregatorBridge == 0) return;
-        nativeGetAllItems(mNativeOfflineContentAggregatorBridge, callback);
+        OfflineContentAggregatorBridgeJni.get().getAllItems(mNativeOfflineContentAggregatorBridge,
+                OfflineContentAggregatorBridge.this, callback);
     }
 
     @Override
     public void getVisualsForItem(ContentId id, VisualsCallback callback) {
-        nativeGetVisualsForItem(
-                mNativeOfflineContentAggregatorBridge, id.namespace, id.id, callback);
+        OfflineContentAggregatorBridgeJni.get().getVisualsForItem(
+                mNativeOfflineContentAggregatorBridge, OfflineContentAggregatorBridge.this,
+                id.namespace, id.id, callback);
     }
 
     @Override
     public void getShareInfoForItem(ContentId id, ShareCallback callback) {
-        nativeGetShareInfoForItem(
-                mNativeOfflineContentAggregatorBridge, id.namespace, id.id, callback);
+        OfflineContentAggregatorBridgeJni.get().getShareInfoForItem(
+                mNativeOfflineContentAggregatorBridge, OfflineContentAggregatorBridge.this,
+                id.namespace, id.id, callback);
     }
 
     @Override
     public void renameItem(ContentId id, String name, Callback</*RenameResult*/ Integer> callback) {
-        nativeRenameItem(
-                mNativeOfflineContentAggregatorBridge, id.namespace, id.id, name, callback);
+        OfflineContentAggregatorBridgeJni.get().renameItem(mNativeOfflineContentAggregatorBridge,
+                OfflineContentAggregatorBridge.this, id.namespace, id.id, name, callback);
     }
 
     @Override
@@ -168,25 +179,34 @@ public class OfflineContentAggregatorBridge implements OfflineContentProvider {
         return new OfflineContentAggregatorBridge(nativeOfflineContentAggregatorBridge);
     }
 
-    // Methods called to C++ via JNI.
-    private native void nativeOpenItem(long nativeOfflineContentAggregatorBridge,
-            @LaunchLocation int location, String nameSpace, String id);
-    private native void nativeRemoveItem(
-            long nativeOfflineContentAggregatorBridge, String nameSpace, String id);
-    private native void nativeCancelDownload(
-            long nativeOfflineContentAggregatorBridge, String nameSpace, String id);
-    private native void nativePauseDownload(
-            long nativeOfflineContentAggregatorBridge, String nameSpace, String id);
-    private native void nativeResumeDownload(long nativeOfflineContentAggregatorBridge,
-            String nameSpace, String id, boolean hasUserGesture);
-    private native void nativeGetItemById(long nativeOfflineContentAggregatorBridge,
-            String nameSpace, String id, Callback<OfflineItem> callback);
-    private native void nativeGetAllItems(
-            long nativeOfflineContentAggregatorBridge, Callback<ArrayList<OfflineItem>> callback);
-    private native void nativeGetVisualsForItem(long nativeOfflineContentAggregatorBridge,
-            String nameSpace, String id, VisualsCallback callback);
-    private native void nativeGetShareInfoForItem(long nativeOfflineContentAggregatorBridge,
-            String nameSpace, String id, ShareCallback callback);
-    private native void nativeRenameItem(long nativeOfflineContentAggregatorBridge,
-            String nameSpace, String id, String name, Callback</*RenameResult*/ Integer> callback);
-}
+    @NativeMethods
+    interface Natives {
+        void openItem(long nativeOfflineContentAggregatorBridge,
+                OfflineContentAggregatorBridge caller, @LaunchLocation int location,
+                String nameSpace, String id);
+
+        void removeItem(long nativeOfflineContentAggregatorBridge,
+                OfflineContentAggregatorBridge caller, String nameSpace, String id);
+        void cancelDownload(long nativeOfflineContentAggregatorBridge,
+                OfflineContentAggregatorBridge caller, String nameSpace, String id);
+        void pauseDownload(long nativeOfflineContentAggregatorBridge,
+                OfflineContentAggregatorBridge caller, String nameSpace, String id);
+        void resumeDownload(long nativeOfflineContentAggregatorBridge,
+                OfflineContentAggregatorBridge caller, String nameSpace, String id,
+                boolean hasUserGesture);
+        void getItemById(long nativeOfflineContentAggregatorBridge,
+                OfflineContentAggregatorBridge caller, String nameSpace, String id,
+                Callback<OfflineItem> callback);
+        void getAllItems(long nativeOfflineContentAggregatorBridge,
+                OfflineContentAggregatorBridge caller, Callback<ArrayList<OfflineItem>> callback);
+        void getVisualsForItem(long nativeOfflineContentAggregatorBridge,
+                OfflineContentAggregatorBridge caller, String nameSpace, String id,
\ No newline at end of file
+                VisualsCallback callback);
+        void getShareInfoForItem(long nativeOfflineContentAggregatorBridge,
+                OfflineContentAggregatorBridge caller, String nameSpace, String id,
+                ShareCallback callback);
+        void renameItem(long nativeOfflineContentAggregatorBridge,
+                OfflineContentAggregatorBridge caller, String nameSpace, String id, String name,
+                Callback</*RenameResult*/ Integer> callback);
+    }
+}

components/payments/content/android/java/src/org/chromium/components/payments/CurrencyFormatter.java

@@ -5,6 +5,7 @@
 package org.chromium.components.payments;
 
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 
 import java.util.Locale;
 
@@ -33,21 +34,22 @@ public class CurrencyFormatter {
 
         // Note that this pointer could leak the native object. The called must call destroy() to
         // ensure that the native object is destroyed.
-        mCurrencyFormatterAndroid =
-                nativeInitCurrencyFormatterAndroid(currencyCode, userLocale.toString());
+        mCurrencyFormatterAndroid = CurrencyFormatterJni.get().initCurrencyFormatterAndroid(
+                CurrencyFormatter.this, currencyCode, userLocale.toString());
     }
 
     /** Will destroy the native object. This class shouldn't be used afterwards. */
     public void destroy() {
         if (mCurrencyFormatterAndroid != 0) {
-            nativeDestroy(mCurrencyFormatterAndroid);
+            CurrencyFormatterJni.get().destroy(mCurrencyFormatterAndroid, CurrencyFormatter.this);
             mCurrencyFormatterAndroid = 0;
         }
     }
 
     /** @return The currency code formatted for display. */
     public String getFormattedCurrencyCode() {
-        return nativeGetFormattedCurrencyCode(mCurrencyFormatterAndroid);
+        return CurrencyFormatterJni.get().getFormattedCurrencyCode(
+                mCurrencyFormatterAndroid, CurrencyFormatter.this);
     }
 
     /**
@@ -63,11 +65,18 @@ public class CurrencyFormatter {
     public String format(String amountValue) {
         assert amountValue != null : "amountValue should not be null";
 
-        return nativeFormat(mCurrencyFormatterAndroid, amountValue);
+        return CurrencyFormatterJni.get().format(
+                mCurrencyFormatterAndroid, CurrencyFormatter.this, amountValue);
     }
 
-    private native long nativeInitCurrencyFormatterAndroid(String currencyCode, String localeName);
-    private native void nativeDestroy(long nativeCurrencyFormatterAndroid);
-    private native String nativeFormat(long nativeCurrencyFormatterAndroid, String amountValue);
-    private native String nativeGetFormattedCurrencyCode(long nativeCurrencyFormatterAndroid);
+    @NativeMethods
+    interface Natives {
+        long initCurrencyFormatterAndroid(
+                CurrencyFormatter caller, String currencyCode, String localeName);
+        void destroy(long nativeCurrencyFormatterAndroid, CurrencyFormatter caller);
+        String format(
+                long nativeCurrencyFormatterAndroid, CurrencyFormatter caller, String amountValue);
+        String getFormattedCurrencyCode(
+                long nativeCurrencyFormatterAndroid, CurrencyFormatter caller);
+    }
 }

components/payments/content/android/java/src/org/chromium/components/payments/OriginSecurityChecker.java

@@ -5,6 +5,7 @@
 package org.chromium.components.payments;
 
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 
 /** Helper for origin security. */
 @JNINamespace("payments")
@@ -17,7 +18,7 @@ public class OriginSecurityChecker {
      * @return Whether the origin of the URL is secure.
      */
     public static boolean isOriginSecure(String url) {
-        return nativeIsOriginSecure(url);
+        return OriginSecurityCheckerJni.get().isOriginSecure(url);
     }
 
     /**
@@ -27,11 +28,14 @@ public class OriginSecurityChecker {
      * @return Whether the scheme of the URL is cryptographic.
      */
     public static boolean isSchemeCryptographic(String url) {
-        return nativeIsSchemeCryptographic(url);
+        return OriginSecurityCheckerJni.get().isSchemeCryptographic(url);
     }
 
     private OriginSecurityChecker() {}
 
-    private static native boolean nativeIsOriginSecure(String url);
-    private static native boolean nativeIsSchemeCryptographic(String url);
+    @NativeMethods
+    interface Natives {
+        boolean isOriginSecure(String url);
+        boolean isSchemeCryptographic(String url);
+    }
 }

components/payments/content/android/java/src/org/chromium/components/payments/PaymentManifestDownloader.java

@@ -7,6 +7,7 @@ package org.chromium.components.payments;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 import org.chromium.content_public.browser.WebContents;
 
 import java.net.URI;
@@ -55,7 +56,7 @@ public class PaymentManifestDownloader {
     public void initialize(WebContents webContents) {
         ThreadUtils.assertOnUiThread();
         assert mNativeObject == 0;
-        mNativeObject = nativeInit(webContents);
+        mNativeObject = PaymentManifestDownloaderJni.get().init(webContents);
     }
 
     /** @return Whether the native downloader is initialized. */
@@ -73,7 +74,8 @@ public class PaymentManifestDownloader {
     public void downloadPaymentMethodManifest(URI methodName, ManifestDownloadCallback callback) {
         ThreadUtils.assertOnUiThread();
         assert mNativeObject != 0;
-        nativeDownloadPaymentMethodManifest(mNativeObject, methodName, callback);
+        PaymentManifestDownloaderJni.get().downloadPaymentMethodManifest(
+                mNativeObject, PaymentManifestDownloader.this, methodName, callback);
     }
 
     /**
@@ -85,14 +87,15 @@ public class PaymentManifestDownloader {
     public void downloadWebAppManifest(URI webAppManifestUri, ManifestDownloadCallback callback) {
         ThreadUtils.assertOnUiThread();
         assert mNativeObject != 0;
-        nativeDownloadWebAppManifest(mNativeObject, webAppManifestUri, callback);
+        PaymentManifestDownloaderJni.get().downloadWebAppManifest(
+                mNativeObject, PaymentManifestDownloader.this, webAppManifestUri, callback);
     }
 
     /** Destroys the native downloader. */
     public void destroy() {
         ThreadUtils.assertOnUiThread();
         assert mNativeObject != 0;
-        nativeDestroy(mNativeObject);
+        PaymentManifestDownloaderJni.get().destroy(mNativeObject, PaymentManifestDownloader.this);
         mNativeObject = 0;
     }
 
@@ -101,11 +104,15 @@ public class PaymentManifestDownloader {
         return methodName.toString();
     }
 
-    private static native long nativeInit(WebContents webContents);
-    private native void nativeDownloadPaymentMethodManifest(
-            long nativePaymentManifestDownloaderAndroid, URI methodName,
-            ManifestDownloadCallback callback);
-    private native void nativeDownloadWebAppManifest(long nativePaymentManifestDownloaderAndroid,
-            URI webAppManifestUri, ManifestDownloadCallback callback);
-    private native void nativeDestroy(long nativePaymentManifestDownloaderAndroid);
+    @NativeMethods
+    interface Natives {
+        long init(WebContents webContents);
+        void downloadPaymentMethodManifest(long nativePaymentManifestDownloaderAndroid,
+                PaymentManifestDownloader caller, URI methodName,
+                ManifestDownloadCallback callback);
+        void downloadWebAppManifest(long nativePaymentManifestDownloaderAndroid,
+                PaymentManifestDownloader caller, URI webAppManifestUri,
+                ManifestDownloadCallback callback);
+        void destroy(long nativePaymentManifestDownloaderAndroid, PaymentManifestDownloader caller);
+    }
 }

components/payments/content/android/java/src/org/chromium/components/payments/PaymentManifestParser.java

@@ -7,6 +7,7 @@ package org.chromium.components.payments;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 import org.chromium.content_public.browser.WebContents;
 
 import java.net.URI;
@@ -53,14 +54,16 @@ public class PaymentManifestParser {
     public void createNative(WebContents webContents) {
         ThreadUtils.assertOnUiThread();
         assert mNativePaymentManifestParserAndroid == 0;
-        mNativePaymentManifestParserAndroid = nativeCreatePaymentManifestParserAndroid(webContents);
+        mNativePaymentManifestParserAndroid =
+                PaymentManifestParserJni.get().createPaymentManifestParserAndroid(webContents);
     }
 
     /** Releases the resources held by the native side. */
     public void destroyNative() {
         ThreadUtils.assertOnUiThread();
         assert mNativePaymentManifestParserAndroid != 0;
-        nativeDestroyPaymentManifestParserAndroid(mNativePaymentManifestParserAndroid);
+        PaymentManifestParserJni.get().destroyPaymentManifestParserAndroid(
+                mNativePaymentManifestParserAndroid);
         mNativePaymentManifestParserAndroid = 0;
     }
 
@@ -79,7 +82,8 @@ public class PaymentManifestParser {
     public void parsePaymentMethodManifest(String content, ManifestParseCallback callback) {
         ThreadUtils.assertOnUiThread();
         assert mNativePaymentManifestParserAndroid != 0;
-        nativeParsePaymentMethodManifest(mNativePaymentManifestParserAndroid, content, callback);
+        PaymentManifestParserJni.get().parsePaymentMethodManifest(
+                mNativePaymentManifestParserAndroid, content, callback);
     }
 
     /**
@@ -91,7 +95,8 @@ public class PaymentManifestParser {
     public void parseWebAppManifest(String content, ManifestParseCallback callback) {
         ThreadUtils.assertOnUiThread();
         assert mNativePaymentManifestParserAndroid != 0;
-        nativeParseWebAppManifest(mNativePaymentManifestParserAndroid, content, callback);
+        PaymentManifestParserJni.get().parseWebAppManifest(
+                mNativePaymentManifestParserAndroid, content, callback);
     }
 
     @CalledByNative
@@ -126,12 +131,13 @@ public class PaymentManifestParser {
         manifest[sectionIndex].fingerprints[fingerprintIndex] = fingerprint;
     }
 
-    private static native long nativeCreatePaymentManifestParserAndroid(WebContents webContents);
-    private static native void nativeDestroyPaymentManifestParserAndroid(
-            long nativePaymentManifestParserAndroid);
-    private static native void nativeParsePaymentMethodManifest(
-            long nativePaymentManifestParserAndroid, String content,
-            ManifestParseCallback callback);
-    private static native void nativeParseWebAppManifest(long nativePaymentManifestParserAndroid,
-            String content, ManifestParseCallback callback);
+    @NativeMethods
+    interface Natives {
+        long createPaymentManifestParserAndroid(WebContents webContents);
+        void destroyPaymentManifestParserAndroid(long nativePaymentManifestParserAndroid);
+        void parsePaymentMethodManifest(long nativePaymentManifestParserAndroid, String content,
+                ManifestParseCallback callback);
+        void parseWebAppManifest(long nativePaymentManifestParserAndroid, String content,
+                ManifestParseCallback callback);
+    }
 }

components/payments/content/android/java/src/org/chromium/components/payments/PaymentValidator.java

@@ -5,6 +5,7 @@
 package org.chromium.components.payments;
 
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 import org.chromium.payments.mojom.PaymentDetails;
 import org.chromium.payments.mojom.PaymentValidationErrors;
 
@@ -19,16 +20,19 @@ public class PaymentValidator {
         if (details == null) {
             return false;
         }
-        return nativeValidatePaymentDetailsAndroid(details.serialize());
+        return PaymentValidatorJni.get().validatePaymentDetailsAndroid(details.serialize());
     }
 
     public static boolean validatePaymentValidationErrors(PaymentValidationErrors errors) {
         if (errors == null) {
             return false;
         }
-        return nativeValidatePaymentValidationErrorsAndroid(errors.serialize());
+        return PaymentValidatorJni.get().validatePaymentValidationErrorsAndroid(errors.serialize());
     }
 
-    private static native boolean nativeValidatePaymentDetailsAndroid(ByteBuffer buffer);
-    private static native boolean nativeValidatePaymentValidationErrorsAndroid(ByteBuffer buffer);
+    @NativeMethods
+    interface Natives {
+        boolean validatePaymentDetailsAndroid(ByteBuffer buffer);
+        boolean validatePaymentValidationErrorsAndroid(ByteBuffer buffer);
+    }
 };

components/policy/android/BUILD.gn

@@ -12,7 +12,10 @@ _jni_sources = [
 android_library("policy_java") {
   deps = [
     "//base:base_java",
+    "//base:jni_java",
   ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
+
   java_files =
       _jni_sources + [
         "java/src/org/chromium/policy/AbstractAppRestrictionsProvider.java",

components/safe_browsing/android/BUILD.gn

@@ -8,8 +8,10 @@ import("//build/config/android/rules.gni")
 android_library("safe_browsing_java") {
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   java_files = [
     "java/src/org/chromium/components/safe_browsing/SafeBrowsingApiBridge.java",
     "java/src/org/chromium/components/safe_browsing/SafeBrowsingApiHandler.java",

components/safe_browsing/android/java/src/org/chromium/components/safe_browsing/SafeBrowsingApiBridge.java

@@ -7,6 +7,7 @@ package org.chromium.components.safe_browsing;
 import org.chromium.base.Log;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 import org.chromium.base.metrics.RecordHistogram;
 
 import java.lang.reflect.InvocationTargetException;
@@ -53,9 +54,10 @@ public final class SafeBrowsingApiBridge {
                     @Override
                     public void onUrlCheckDone(
                             long callbackId, int resultStatus, String metadata, long checkDelta) {
-                        nativeOnUrlCheckDone(callbackId, resultStatus, metadata, checkDelta);
+                        SafeBrowsingApiBridgeJni.get().onUrlCheckDone(
+                                callbackId, resultStatus, metadata, checkDelta);
                     }
-                }, nativeAreLocalBlacklistsEnabled());
+                }, SafeBrowsingApiBridgeJni.get().areLocalBlacklistsEnabled());
         return initSuccesssful ? handler : null;
     }
 
@@ -97,13 +99,15 @@ public final class SafeBrowsingApiBridge {
         return matched;
     }
 
-    private static native boolean nativeAreLocalBlacklistsEnabled();
-    private static native void nativeOnUrlCheckDone(
-            long callbackId, int resultStatus, String metadata, long checkDelta);
-
     // Histograms
     private static void recordAllowlistLookupTimeInMs(long lookupTimeInMs) {
         RecordHistogram.recordTimesHistogram(
                 "SB2.RemoteCall.LocalAllowlistLookupTime", lookupTimeInMs);
     }
+
+    @NativeMethods
+    interface Natives {
+        boolean areLocalBlacklistsEnabled();
+        void onUrlCheckDone(long callbackId, int resultStatus, String metadata, long checkDelta);
+    }
 }

components/search_engines/android/BUILD.gn

@@ -7,8 +7,10 @@ import("//build/config/android/rules.gni")
 android_library("java") {
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//content/public/android:content_java",
   ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 
   java_files = [
     "java/src/org/chromium/components/search_engines/TemplateUrl.java",

components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrl.java

@@ -4,6 +4,7 @@
 package org.chromium.components.search_engines;
 
 import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.NativeMethods;
 
 import java.util.Locale;
 
@@ -28,7 +29,7 @@ public class TemplateUrl {
      * @return The name of the search engine.
      */
     public String getShortName() {
-        return nativeGetShortName(mTemplateUrlPtr);
+        return TemplateUrlJni.get().getShortName(mTemplateUrlPtr);
     }
 
     /**
@@ -36,21 +37,21 @@ public class TemplateUrl {
      *         non-zero, for custom search engines, it will return 0.
      */
     public int getPrepopulatedId() {
-        return nativeGetPrepopulatedId(mTemplateUrlPtr);
+        return TemplateUrlJni.get().getPrepopulatedId(mTemplateUrlPtr);
     }
 
     /**
      * @return Whether a search engine is prepopulated or created by policy.
      */
     public boolean getIsPrepopulated() {
-        return nativeIsPrepopulatedOrCreatedByPolicy(mTemplateUrlPtr);
+        return TemplateUrlJni.get().isPrepopulatedOrCreatedByPolicy(mTemplateUrlPtr);
     }
 
     /**
      * @return The keyword of the search engine.
      */
     public String getKeyword() {
-        return nativeGetKeyword(mTemplateUrlPtr);
+        return TemplateUrlJni.get().getKeyword(mTemplateUrlPtr);
     }
 
     /**
@@ -58,7 +59,7 @@ public class TemplateUrl {
      *         return 0.
      */
     public long getLastVisitedTime() {
-        return nativeGetLastVisitedTime(mTemplateUrlPtr);
+        return TemplateUrlJni.get().getLastVisitedTime(mTemplateUrlPtr);
     }
 
     /**
@@ -66,7 +67,7 @@ public class TemplateUrl {
      *         prepopulated_engines.json.
      */
     public String getURL() {
-        return nativeGetURL(mTemplateUrlPtr);
+        return TemplateUrlJni.get().getURL(mTemplateUrlPtr);
     }
 
     @Override
@@ -84,10 +85,13 @@ public class TemplateUrl {
                 getKeyword(), getShortName(), getIsPrepopulated());
     }
 
-    private static native String nativeGetShortName(long templateUrlPtr);
-    private static native String nativeGetKeyword(long templateUrlPtr);
-    private static native boolean nativeIsPrepopulatedOrCreatedByPolicy(long templateUrlPtr);
-    private static native long nativeGetLastVisitedTime(long templateUrlPtr);
-    private static native int nativeGetPrepopulatedId(long templateUrlPtr);
-    private static native String nativeGetURL(long templateUrlPtr);
+    @NativeMethods
+    interface Natives {
+        String getShortName(long templateUrlPtr);
+        String getKeyword(long templateUrlPtr);
+        boolean isPrepopulatedOrCreatedByPolicy(long templateUrlPtr);
+        long getLastVisitedTime(long templateUrlPtr);
+        int getPrepopulatedId(long templateUrlPtr);
+        String getURL(long templateUrlPtr);
+    }
 }

components/signin/core/browser/android/java/src/org/chromium/components/signin/ChildAccountInfoFetcher.java

@@ -14,6 +14,7 @@ import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.NativeMethods;
 
 /**
  * ChildAccountInfoFetcher for the Android platform.
@@ -81,7 +82,8 @@ public final class ChildAccountInfoFetcher {
     private void setIsChildAccount(boolean isChildAccount) {
         Log.d(TAG, "Setting child account status for %s to %s", mAccount.name,
                 Boolean.toString(isChildAccount));
-        nativeSetIsChildAccount(mNativeAccountFetcherService, mAccountId, isChildAccount);
+        ChildAccountInfoFetcherJni.get().setIsChildAccount(
+                mNativeAccountFetcherService, mAccountId, isChildAccount);
     }
 
     @CalledByNative
@@ -90,6 +92,9 @@ public final class ChildAccountInfoFetcher {
         AccountManagerFacade.overrideAccountManagerFacadeForTests(delegate);
     }
 
-    private static native void nativeSetIsChildAccount(
-            long accountFetcherServicePtr, String accountId, boolean isChildAccount);
+    @NativeMethods
+    interface Natives {
+        void setIsChildAccount(
+                long accountFetcherServicePtr, String accountId, boolean isChildAccount);
+    }
 }

components/signin/core/browser/android/java/src/org/chromium/components/signin/OAuth2TokenService.java

@@ -16,6 +16,7 @@ import org.chromium.base.StrictModeContext;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.NativeMethods;
 import org.chromium.base.task.AsyncTask;
 import org.chromium.net.NetworkChangeNotifier;
 
@@ -134,19 +135,22 @@ public final class OAuth2TokenService
             String username, String scope, final long nativeCallback) {
         Account account = getAccountOrNullFromUsername(username);
         if (account == null) {
-            ThreadUtils.postOnUiThread(() -> nativeOAuth2TokenFetched(null, false, nativeCallback));
+            ThreadUtils.postOnUiThread(()
+                                               -> OAuth2TokenServiceJni.get().oAuth2TokenFetched(
+                                                       null, false, nativeCallback));
             return;
         }
         String oauth2Scope = OAUTH2_SCOPE_PREFIX + scope;
         getAccessToken(account, oauth2Scope, new GetAccessTokenCallback() {
             @Override
             public void onGetTokenSuccess(String token) {
-                nativeOAuth2TokenFetched(token, false, nativeCallback);
+                OAuth2TokenServiceJni.get().oAuth2TokenFetched(token, false, nativeCallback);
             }
 
             @Override
             public void onGetTokenFailure(boolean isTransientError) {
-                nativeOAuth2TokenFetched(null, isTransientError, nativeCallback);
+                OAuth2TokenServiceJni.get().oAuth2TokenFetched(
+                        null, isTransientError, nativeCallback);
             }
         });
     }
@@ -282,7 +286,8 @@ public final class OAuth2TokenService
             // change (re-signin or sign out signed-in account).
             currentlySignedInAccount = null;
         }
-        nativeUpdateAccountList(mNativeOAuth2TokenServiceDelegate, currentlySignedInAccount);
+        OAuth2TokenServiceJni.get().updateAccountList(mNativeOAuth2TokenServiceDelegate,
+                OAuth2TokenService.this, currentlySignedInAccount);
     }
 
     private boolean isSignedInAccountChanged(String signedInAccountName) {
@@ -391,8 +396,10 @@ public final class OAuth2TokenService
         }
     }
 
-    private static native void nativeOAuth2TokenFetched(
-            String authToken, boolean isTransientError, long nativeCallback);
-    private native void nativeUpdateAccountList(
-            long nativeOAuth2TokenServiceDelegateAndroid, String currentlySignedInAccount);
+    @NativeMethods
+    interface Natives {
+        void oAuth2TokenFetched(String authToken, boolean isTransientError, long nativeCallback);
+        void updateAccountList(long nativeOAuth2TokenServiceDelegateAndroid,
+                OAuth2TokenService caller, String currentlySignedInAccount);
+    }
 }

components/spellcheck/browser/android/BUILD.gn

@@ -13,7 +13,9 @@ generate_jni("jni_headers") {
 android_library("java") {
   deps = [
     "//base:base_java",
+    "//base:jni_java",
   ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 
   java_files = [ "java/src/org/chromium/components/spellcheck/SpellCheckerSessionBridge.java" ]
 }

components/spellcheck/browser/android/java/src/org/chromium/components/spellcheck/SpellCheckerSessionBridge.java

@@ -15,6 +15,7 @@ import android.view.textservice.TextServicesManager;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.NativeMethods;
 import org.chromium.base.metrics.RecordHistogram;
 
 import java.util.ArrayList;
@@ -136,7 +137,8 @@ public class SpellCheckerSessionBridge implements SpellCheckerSessionListener {
                 }
             }
         }
-        nativeProcessSpellCheckResults(mNativeSpellCheckerSessionBridge,
+        SpellCheckerSessionBridgeJni.get().processSpellCheckResults(
+                mNativeSpellCheckerSessionBridge, SpellCheckerSessionBridge.this,
                 convertListToArray(offsets), convertListToArray(lengths),
                 suggestions.toArray(new String[suggestions.size()][]));
 
@@ -159,6 +161,10 @@ public class SpellCheckerSessionBridge implements SpellCheckerSessionListener {
     @Override
     public void onGetSuggestions(SuggestionsInfo[] results) {}
 
-    private native void nativeProcessSpellCheckResults(long nativeSpellCheckerSessionBridge,
-            int[] offsets, int[] lengths, String[][] suggestions);
+    @NativeMethods
+    interface Natives {
+        void processSpellCheckResults(long nativeSpellCheckerSessionBridge,
+                SpellCheckerSessionBridge caller, int[] offsets, int[] lengths,
+                String[][] suggestions);
+    }
 }

components/sync/android/BUILD.gn

@@ -8,6 +8,7 @@ import("//build/config/android/rules.gni")
 android_library("sync_java") {
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//components/signin/core/browser/android:java",
     "//net/android:net_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
@@ -16,6 +17,7 @@ android_library("sync_java") {
     "//third_party/cacheinvalidation:cacheinvalidation_proto_java",
     "//third_party/jsr-305:jsr_305_javalib",
   ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   srcjar_deps = [ ":java_enums" ]
   java_files = [
     "java/src/org/chromium/components/sync/AndroidSyncSettings.java",

components/sync/android/java/src/org/chromium/components/sync/ModelTypeHelper.java

@@ -10,6 +10,7 @@ import com.google.protos.ipc.invalidation.Types;
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -100,7 +101,7 @@ public class ModelTypeHelper {
         if (modelType == ModelType.PROXY_TABS) {
             return "PROXY_TABS";
         }
-        return nativeModelTypeToNotificationType(modelType);
+        return ModelTypeHelperJni.get().modelTypeToNotificationType(modelType);
     }
 
     /**
@@ -125,5 +126,8 @@ public class ModelTypeHelper {
         sDelegate = delegate;
     }
 
-    private static native String nativeModelTypeToNotificationType(int modelType);
+    @NativeMethods
+    interface Natives {
+        String modelTypeToNotificationType(int modelType);
+    }
 }

components/variations/android/BUILD.gn

@@ -7,8 +7,10 @@ import("//build/config/android/rules.gni")
 android_library("variations_java") {
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//third_party/android_deps:com_android_support_support_core_utils_java",
   ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   java_files = [
     "java/src/org/chromium/components/variations/VariationsAssociatedData.java",
     "java/src/org/chromium/components/variations/firstrun/VariationsSeedBridge.java",

components/variations/android/java/src/org/chromium/components/variations/VariationsAssociatedData.java

@@ -5,6 +5,7 @@
 package org.chromium.components.variations;
 
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 
 import java.util.HashMap;
 
@@ -24,15 +25,18 @@ public final class VariationsAssociatedData {
      *     parameter does not exist.
      */
     public static String getVariationParamValue(String trialName, String paramName) {
-        return nativeGetVariationParamValue(trialName, paramName);
+        return VariationsAssociatedDataJni.get().getVariationParamValue(trialName, paramName);
     }
 
     public static HashMap<String, String> getFeedbackMap() {
         HashMap<String, String> map = new HashMap<String, String>();
-        map.put("Chrome Variations", nativeGetFeedbackVariations());
+        map.put("Chrome Variations", VariationsAssociatedDataJni.get().getFeedbackVariations());
         return map;
     }
 
-    private static native String nativeGetVariationParamValue(String trialName, String paramName);
-    private static native String nativeGetFeedbackVariations();
+    @NativeMethods
+    interface Natives {
+        String getVariationParamValue(String trialName, String paramName);
+        String getFeedbackVariations();
+    }
 }

components/viz/service/BUILD.gn

@@ -546,8 +546,10 @@ if (is_android) {
   android_library("service_java") {
     deps = [
       "//base:base_java",
+      "//base:jni_java",
       "//ui/android:ui_full_java",
     ]
+    annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
     java_files = [
       "java/src/org/chromium/components/viz/service/gl/ThrowUncaughtException.java",
       "java/src/org/chromium/components/viz/service/frame_sinks/ExternalBeginFrameSourceAndroid.java",

components/viz/service/java/src/org/chromium/components/viz/service/frame_sinks/ExternalBeginFrameSourceAndroid.java

@@ -8,6 +8,7 @@ import org.chromium.base.ContextUtils;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.MainDex;
+import org.chromium.base.annotations.NativeMethods;
 import org.chromium.ui.VSyncMonitor;
 
 /**
@@ -25,7 +26,8 @@ public class ExternalBeginFrameSourceAndroid {
             if (!mVSyncNotificationsEnabled) {
                 return;
             }
-            nativeOnVSync(mNativeExternalBeginFrameSourceAndroid, vsyncTimeMicros,
+            ExternalBeginFrameSourceAndroidJni.get().onVSync(mNativeExternalBeginFrameSourceAndroid,
+                    ExternalBeginFrameSourceAndroid.this, vsyncTimeMicros,
                     mVSyncMonitor.getVSyncPeriodInMicroseconds());
             mVSyncMonitor.requestUpdate();
         }
@@ -56,6 +58,10 @@ public class ExternalBeginFrameSourceAndroid {
         mVSyncMonitor.updateRefreshRate(refreshRate);
     }
 
-    private native void nativeOnVSync(long nativeExternalBeginFrameSourceAndroid,
-            long vsyncTimeMicros, long vsyncPeriodMicros);
+    @NativeMethods
+    interface Natives {
+        void onVSync(long nativeExternalBeginFrameSourceAndroid,
+                ExternalBeginFrameSourceAndroid caller, long vsyncTimeMicros,
+                long vsyncPeriodMicros);
+    }
 };