JNI refactor: @NativeMethods conversion (rest of //chrome).

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

Tbr: agrieve@chromium.org
Bug: 929661
Change-Id: Iead2b36f9526ba122fe1bfdfb73eab5c1696abbd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1815048
Commit-Queue: Eric Stevenson <estevenson@chromium.org>
Auto-Submit: Eric Stevenson <estevenson@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#698505}

chrome/android/public/profiles/BUILD.gn

@@ -9,9 +9,11 @@ import("//build/config/android/rules.gni")
 android_library("java") {
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//chrome/android/public/crypto:java",
     "//content/public/android:content_java",
   ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   java_files = [
     "java/src/org/chromium/chrome/browser/cookies/CanonicalCookie.java",
     "java/src/org/chromium/chrome/browser/cookies/CookiesFetcher.java",

chrome/android/public/profiles/java/src/org/chromium/chrome/browser/cookies/CookiesFetcher.java

@@ -9,6 +9,7 @@ import org.chromium.base.ImportantFileWriterAndroid;
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.NativeMethods;
 import org.chromium.base.task.AsyncTask;
 import org.chromium.base.task.BackgroundOnlyAsyncTask;
 import org.chromium.chrome.browser.crypto.CipherFactory;
@@ -57,7 +58,7 @@ public class CookiesFetcher {
      */
     public static void persistCookies() {
         try {
-            nativePersistCookies();
+            CookiesFetcherJni.get().persistCookies();
         } catch (RuntimeException e) {
             e.printStackTrace();
         }
@@ -121,10 +122,11 @@ public class CookiesFetcher {
             protected void onPostExecute(List<CanonicalCookie> cookies) {
                 // We can only access cookies and profiles on the UI thread.
                 for (CanonicalCookie cookie : cookies) {
-                    nativeRestoreCookies(cookie.getName(), cookie.getValue(), cookie.getDomain(),
-                            cookie.getPath(), cookie.getCreationDate(), cookie.getExpirationDate(),
-                            cookie.getLastAccessDate(), cookie.isSecure(), cookie.isHttpOnly(),
-                            cookie.getSameSite(), cookie.getPriority());
+                    CookiesFetcherJni.get().restoreCookies(cookie.getName(), cookie.getValue(),
+                            cookie.getDomain(), cookie.getPath(), cookie.getCreationDate(),
+                            cookie.getExpirationDate(), cookie.getLastAccessDate(),
+                            cookie.isSecure(), cookie.isHttpOnly(), cookie.getSameSite(),
+                            cookie.getPriority());
                 }
             }
         }.executeOnExecutor(AsyncTask.SERIAL_EXECUTOR);
@@ -220,8 +222,11 @@ public class CookiesFetcher {
         return new CanonicalCookie[size];
     }
 
-    private static native void nativePersistCookies();
-    private static native void nativeRestoreCookies(String name, String value, String domain,
-            String path, long creation, long expiration, long lastAccess, boolean secure,
-            boolean httpOnly, int sameSite, int priority);
+    @NativeMethods
+    interface Natives {
+        void persistCookies();
+        void restoreCookies(String name, String value, String domain, String path, long creation,
+                long expiration, long lastAccess, boolean secure, boolean httpOnly, int sameSite,
+                int priority);
+    }
 }

chrome/android/public/profiles/java/src/org/chromium/chrome/browser/profiles/Profile.java

@@ -6,6 +6,7 @@ package org.chromium.chrome.browser.profiles;
 
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.NativeMethods;
 import org.chromium.base.library_loader.LibraryProcessType;
 import org.chromium.chrome.browser.cookies.CookiesFetcher;
 import org.chromium.content_public.browser.BrowserStartupController;
@@ -22,7 +23,7 @@ public class Profile {
 
     private Profile(long nativeProfileAndroid) {
         mNativeProfileAndroid = nativeProfileAndroid;
-        mIsOffTheRecord = nativeIsOffTheRecord(mNativeProfileAndroid);
+        mIsOffTheRecord = ProfileJni.get().isOffTheRecord(mNativeProfileAndroid, Profile.this);
     }
 
     public static Profile getLastUsedProfile() {
@@ -31,7 +32,7 @@ public class Profile {
                         .isFullBrowserStarted()) {
             throw new IllegalStateException("Browser hasn't finished initialization yet!");
         }
-        return (Profile) nativeGetLastUsedProfile();
+        return (Profile) ProfileJni.get().getLastUsedProfile();
     }
 
     /**
@@ -40,23 +41,24 @@ public class Profile {
      * this call.
      */
     public void destroyWhenAppropriate() {
-        nativeDestroyWhenAppropriate(mNativeProfileAndroid);
+        ProfileJni.get().destroyWhenAppropriate(mNativeProfileAndroid, Profile.this);
     }
 
     public Profile getOriginalProfile() {
-        return (Profile) nativeGetOriginalProfile(mNativeProfileAndroid);
+        return (Profile) ProfileJni.get().getOriginalProfile(mNativeProfileAndroid, Profile.this);
     }
 
     public Profile getOffTheRecordProfile() {
-        return (Profile) nativeGetOffTheRecordProfile(mNativeProfileAndroid);
+        return (Profile) ProfileJni.get().getOffTheRecordProfile(
+                mNativeProfileAndroid, Profile.this);
     }
 
     public boolean hasOffTheRecordProfile() {
-        return nativeHasOffTheRecordProfile(mNativeProfileAndroid);
+        return ProfileJni.get().hasOffTheRecordProfile(mNativeProfileAndroid, Profile.this);
     }
 
     public ProfileKey getProfileKey() {
-        return (ProfileKey) nativeGetProfileKey(mNativeProfileAndroid);
+        return (ProfileKey) ProfileJni.get().getProfileKey(mNativeProfileAndroid, Profile.this);
     }
 
     public boolean isOffTheRecord() {
@@ -67,14 +69,14 @@ public class Profile {
      * @return Whether the profile is signed in to a child account.
      */
     public boolean isChild() {
-        return nativeIsChild(mNativeProfileAndroid);
+        return ProfileJni.get().isChild(mNativeProfileAndroid, Profile.this);
     }
 
     /**
      * Wipes all data for this profile.
      */
     public void wipe() {
-        nativeWipe(mNativeProfileAndroid);
+        ProfileJni.get().wipe(mNativeProfileAndroid, Profile.this);
     }
 
     /**
@@ -104,13 +106,16 @@ public class Profile {
         return mNativeProfileAndroid;
     }
 
-    private static native Object nativeGetLastUsedProfile();
-    private native void nativeDestroyWhenAppropriate(long nativeProfileAndroid);
-    private native Object nativeGetOriginalProfile(long nativeProfileAndroid);
-    private native Object nativeGetOffTheRecordProfile(long nativeProfileAndroid);
-    private native boolean nativeHasOffTheRecordProfile(long nativeProfileAndroid);
-    private native boolean nativeIsOffTheRecord(long nativeProfileAndroid);
-    private native boolean nativeIsChild(long nativeProfileAndroid);
-    private native void nativeWipe(long nativeProfileAndroid);
-    private native Object nativeGetProfileKey(long nativeProfileAndroid);
+    @NativeMethods
+    interface Natives {
+        Object getLastUsedProfile();
+        void destroyWhenAppropriate(long nativeProfileAndroid, Profile caller);
+        Object getOriginalProfile(long nativeProfileAndroid, Profile caller);
+        Object getOffTheRecordProfile(long nativeProfileAndroid, Profile caller);
+        boolean hasOffTheRecordProfile(long nativeProfileAndroid, Profile caller);
+        boolean isOffTheRecord(long nativeProfileAndroid, Profile caller);
+        boolean isChild(long nativeProfileAndroid, Profile caller);
+        void wipe(long nativeProfileAndroid, Profile caller);
+        Object getProfileKey(long nativeProfileAndroid, Profile caller);
+    }
 }

chrome/android/public/profiles/java/src/org/chromium/chrome/browser/profiles/ProfileKey.java

@@ -5,6 +5,7 @@
 package org.chromium.chrome.browser.profiles;
 
 import org.chromium.base.annotations.CalledByNative;
+import org.chromium.base.annotations.NativeMethods;
 
 /**
  * Wrapper that allows passing a ProfileKey reference around in the Java layer.
@@ -18,17 +19,19 @@ public class ProfileKey {
 
     private ProfileKey(long nativeProfileKeyAndroid) {
         mNativeProfileKeyAndroid = nativeProfileKeyAndroid;
-        mIsOffTheRecord = nativeIsOffTheRecord(mNativeProfileKeyAndroid);
+        mIsOffTheRecord =
+                ProfileKeyJni.get().isOffTheRecord(mNativeProfileKeyAndroid, ProfileKey.this);
     }
 
     public static ProfileKey getLastUsedProfileKey() {
         // TODO(mheikal): Assert at least reduced mode is started when https://crbug.com/973241 is
         // fixed.
-        return (ProfileKey) nativeGetLastUsedProfileKey();
+        return (ProfileKey) ProfileKeyJni.get().getLastUsedProfileKey();
     }
 
     public ProfileKey getOriginalKey() {
-        return (ProfileKey) nativeGetOriginalKey(mNativeProfileKeyAndroid);
+        return (ProfileKey) ProfileKeyJni.get().getOriginalKey(
+                mNativeProfileKeyAndroid, ProfileKey.this);
     }
 
     public boolean isOffTheRecord() {
@@ -50,7 +53,10 @@ public class ProfileKey {
         return mNativeProfileKeyAndroid;
     }
 
-    private static native Object nativeGetLastUsedProfileKey();
-    private native Object nativeGetOriginalKey(long nativeProfileKeyAndroid);
-    private native boolean nativeIsOffTheRecord(long nativeProfileKeyAndroid);
+    @NativeMethods
+    interface Natives {
+        Object getLastUsedProfileKey();
+        Object getOriginalKey(long nativeProfileKeyAndroid, ProfileKey caller);
+        boolean isOffTheRecord(long nativeProfileKeyAndroid, ProfileKey caller);
+    }
 }

chrome/android/public/profiles/java/src/org/chromium/chrome/browser/profiles/ProfileManagerUtils.java

@@ -9,6 +9,7 @@ import android.os.SystemClock;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.base.TraceEvent;
+import org.chromium.base.annotations.NativeMethods;
 
 /**
  * A utility class for applying operations on all loaded profiles.
@@ -26,7 +27,7 @@ public class ProfileManagerUtils {
     public static void flushPersistentDataForAllProfiles() {
         try {
             TraceEvent.begin("ProfileManagerUtils.commitPendingWritesForAllProfiles");
-            nativeFlushPersistentDataForAllProfiles();
+            ProfileManagerUtilsJni.get().flushPersistentDataForAllProfiles();
         } finally {
             TraceEvent.end("ProfileManagerUtils.commitPendingWritesForAllProfiles");
         }
@@ -47,7 +48,7 @@ public class ProfileManagerUtils {
 
         // Allow some leeway to account for fractions of milliseconds.
         if (Math.abs(difference) > BOOT_TIMESTAMP_MARGIN_MS) {
-            nativeRemoveSessionCookiesForAllProfiles();
+            ProfileManagerUtilsJni.get().removeSessionCookiesForAllProfiles();
 
             SharedPreferences prefs = ContextUtils.getAppSharedPreferences();
             SharedPreferences.Editor editor = prefs.edit();
@@ -56,6 +57,9 @@ public class ProfileManagerUtils {
         }
     }
 
-    private static native void nativeFlushPersistentDataForAllProfiles();
-    private static native void nativeRemoveSessionCookiesForAllProfiles();
+    @NativeMethods
+    interface Natives {
+        void flushPersistentDataForAllProfiles();
+        void removeSessionCookiesForAllProfiles();
+    }
 }

chrome/browser/android/thin_webview/internal/BUILD.gn

@@ -35,10 +35,12 @@ android_library("internal_java") {
 
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//chrome/browser/android/thin_webview:java",
     "//content/public/android:content_java",
     "//ui/android:ui_java",
   ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }
 
 generate_jni("jni_headers") {

chrome/browser/android/thin_webview/internal/java/src/org/chromium/chrome/browser/thinwebview/internal/CompositorViewImpl.java

@@ -16,6 +16,7 @@ import android.view.View;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 import org.chromium.chrome.browser.thinwebview.CompositorView;
 import org.chromium.ui.base.WindowAndroid;
 
@@ -40,7 +41,8 @@ public class CompositorViewImpl implements CompositorView {
     public CompositorViewImpl(Context context, WindowAndroid windowAndroid) {
         mContext = context;
         mView = useSurfaceView() ? createSurfaceView() : createTextureView();
-        mNativeCompositorViewImpl = nativeInit(windowAndroid);
+        mNativeCompositorViewImpl =
+                CompositorViewImplJni.get().init(CompositorViewImpl.this, windowAndroid);
     }
 
     @Override
@@ -50,12 +52,17 @@ public class CompositorViewImpl implements CompositorView {
 
     @Override
     public void destroy() {
-        if (mNativeCompositorViewImpl != 0) nativeDestroy(mNativeCompositorViewImpl);
+        if (mNativeCompositorViewImpl != 0) {
+            CompositorViewImplJni.get().destroy(mNativeCompositorViewImpl, CompositorViewImpl.this);
+        }
     }
 
     @Override
     public void requestRender() {
-        if (mNativeCompositorViewImpl != 0) nativeSetNeedsComposite(mNativeCompositorViewImpl);
+        if (mNativeCompositorViewImpl != 0) {
+            CompositorViewImplJni.get().setNeedsComposite(
+                    mNativeCompositorViewImpl, CompositorViewImpl.this);
+        }
     }
 
     private SurfaceView createSurfaceView() {
@@ -64,21 +71,23 @@ public class CompositorViewImpl implements CompositorView {
             @Override
             public void surfaceCreated(SurfaceHolder surfaceHolder) {
                 if (mNativeCompositorViewImpl == 0) return;
-                nativeSurfaceCreated(mNativeCompositorViewImpl);
+                CompositorViewImplJni.get().surfaceCreated(
+                        mNativeCompositorViewImpl, CompositorViewImpl.this);
             }
 
             @Override
             public void surfaceChanged(
                     SurfaceHolder surfaceHolder, int format, int width, int height) {
                 if (mNativeCompositorViewImpl == 0) return;
-                nativeSurfaceChanged(mNativeCompositorViewImpl, format, width, height,
-                        surfaceHolder.getSurface());
+                CompositorViewImplJni.get().surfaceChanged(mNativeCompositorViewImpl,
+                        CompositorViewImpl.this, format, width, height, surfaceHolder.getSurface());
             }
 
             @Override
             public void surfaceDestroyed(SurfaceHolder surfaceHolder) {
                 if (mNativeCompositorViewImpl == 0) return;
-                nativeSurfaceDestroyed(mNativeCompositorViewImpl);
+                CompositorViewImplJni.get().surfaceDestroyed(
+                        mNativeCompositorViewImpl, CompositorViewImpl.this);
             }
         });
 
@@ -95,14 +104,16 @@ public class CompositorViewImpl implements CompositorView {
             public void onSurfaceTextureSizeChanged(
                     SurfaceTexture surfaceTexture, int width, int height) {
                 if (mNativeCompositorViewImpl == 0) return;
-                nativeSurfaceChanged(mNativeCompositorViewImpl, PixelFormat.OPAQUE, width, height,
+                CompositorViewImplJni.get().surfaceChanged(mNativeCompositorViewImpl,
+                        CompositorViewImpl.this, PixelFormat.OPAQUE, width, height,
                         new Surface(surfaceTexture));
             }
 
             @Override
             public boolean onSurfaceTextureDestroyed(SurfaceTexture surfaceTexture) {
                 if (mNativeCompositorViewImpl == 0) return false;
-                nativeSurfaceDestroyed(mNativeCompositorViewImpl);
+                CompositorViewImplJni.get().surfaceDestroyed(
+                        mNativeCompositorViewImpl, CompositorViewImpl.this);
                 return false;
             }
 
@@ -110,8 +121,10 @@ public class CompositorViewImpl implements CompositorView {
             public void onSurfaceTextureAvailable(
                     SurfaceTexture surfaceTexture, int width, int height) {
                 if (mNativeCompositorViewImpl == 0) return;
-                nativeSurfaceCreated(mNativeCompositorViewImpl);
-                nativeSurfaceChanged(mNativeCompositorViewImpl, PixelFormat.OPAQUE, width, height,
+                CompositorViewImplJni.get().surfaceCreated(
+                        mNativeCompositorViewImpl, CompositorViewImpl.this);
+                CompositorViewImplJni.get().surfaceChanged(mNativeCompositorViewImpl,
+                        CompositorViewImpl.this, PixelFormat.OPAQUE, width, height,
                         new Surface(surfaceTexture));
             }
         });
@@ -136,11 +149,14 @@ public class CompositorViewImpl implements CompositorView {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N;
     }
 
-    private native long nativeInit(WindowAndroid windowAndroid);
-    private native void nativeDestroy(long nativeCompositorViewImpl);
-    private native void nativeSurfaceCreated(long nativeCompositorViewImpl);
-    private native void nativeSurfaceDestroyed(long nativeCompositorViewImpl);
-    private native void nativeSurfaceChanged(
-            long nativeCompositorViewImpl, int format, int width, int height, Surface surface);
-    private native void nativeSetNeedsComposite(long nativeCompositorViewImpl);
+    @NativeMethods
+    interface Natives {
+        long init(CompositorViewImpl caller, WindowAndroid windowAndroid);
+        void destroy(long nativeCompositorViewImpl, CompositorViewImpl caller);
+        void surfaceCreated(long nativeCompositorViewImpl, CompositorViewImpl caller);
+        void surfaceDestroyed(long nativeCompositorViewImpl, CompositorViewImpl caller);
+        void surfaceChanged(long nativeCompositorViewImpl, CompositorViewImpl caller, int format,
+                int width, int height, Surface surface);
+        void setNeedsComposite(long nativeCompositorViewImpl, CompositorViewImpl caller);
+    }
 }

chrome/browser/android/thin_webview/internal/java/src/org/chromium/chrome/browser/thinwebview/internal/ThinWebViewImpl.java

@@ -12,6 +12,7 @@ import android.widget.FrameLayout;
 import androidx.annotation.Nullable;
 
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 import org.chromium.chrome.browser.thinwebview.CompositorView;
 import org.chromium.chrome.browser.thinwebview.ThinWebView;
 import org.chromium.content_public.browser.WebContents;
@@ -41,7 +42,8 @@ public class ThinWebViewImpl extends FrameLayout implements ThinWebView {
                 ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
         addView(mCompositorView.getView(), layoutParams);
 
-        mNativeThinWebViewImpl = nativeInit(mCompositorView, windowAndroid);
+        mNativeThinWebViewImpl =
+                ThinWebViewImplJni.get().init(ThinWebViewImpl.this, mCompositorView, windowAndroid);
     }
 
     @Override
@@ -54,20 +56,24 @@ public class ThinWebViewImpl extends FrameLayout implements ThinWebView {
         mWebContents = webContents;
 
         setContentView(contentView);
-        nativeSetWebContents(mNativeThinWebViewImpl, mWebContents);
+        ThinWebViewImplJni.get().setWebContents(
+                mNativeThinWebViewImpl, ThinWebViewImpl.this, mWebContents);
         mWebContents.onShow();
     }
 
     @Override
     public void destroy() {
         mCompositorView.destroy();
-        if (mNativeThinWebViewImpl != 0) nativeDestroy(mNativeThinWebViewImpl);
+        if (mNativeThinWebViewImpl != 0) {
+            ThinWebViewImplJni.get().destroy(mNativeThinWebViewImpl, ThinWebViewImpl.this);
+        }
     }
 
     @Override
     protected void onSizeChanged(int w, int h, int oldw, int oldh) {
         if (w != oldw || h != oldh) {
-            nativeSizeChanged(mNativeThinWebViewImpl, w, h);
+            ThinWebViewImplJni.get().sizeChanged(
+                    mNativeThinWebViewImpl, ThinWebViewImpl.this, w, h);
         }
     }
 
@@ -83,8 +89,13 @@ public class ThinWebViewImpl extends FrameLayout implements ThinWebView {
         if (mContentView != null) addView(mContentView, 1);
     }
 
-    private native long nativeInit(CompositorView compositorView, WindowAndroid windowAndroid);
-    private native void nativeDestroy(long nativeThinWebView);
-    private native void nativeSetWebContents(long nativeThinWebView, WebContents webContents);
-    private native void nativeSizeChanged(long nativeThinWebView, int width, int height);
+    @NativeMethods
+    interface Natives {
+        long init(
+                ThinWebViewImpl caller, CompositorView compositorView, WindowAndroid windowAndroid);
+        void destroy(long nativeThinWebView, ThinWebViewImpl caller);
+        void setWebContents(
+                long nativeThinWebView, ThinWebViewImpl caller, WebContents webContents);
+        void sizeChanged(long nativeThinWebView, ThinWebViewImpl caller, int width, int height);
+    }
 }

chrome/browser/image_fetcher/BUILD.gn

@@ -7,11 +7,13 @@ import("//build/config/android/rules.gni")
 android_library("java") {
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//chrome/android/public/profiles:java",
     "//chrome/lib/util/public/android:java",
     "//content/public/android:content_java",
     "//third_party/gif_player:gif_player_java",
   ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   java_files = [
     "android/java/src/org/chromium/chrome/browser/image_fetcher/CachedImageFetcher.java",
     "android/java/src/org/chromium/chrome/browser/image_fetcher/ImageFetcherBridge.java",

chrome/browser/image_fetcher/android/java/src/org/chromium/chrome/browser/image_fetcher/ImageFetcherBridge.java

@@ -8,6 +8,7 @@ import android.graphics.Bitmap;
 
 import org.chromium.base.Callback;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 import org.chromium.chrome.browser.profiles.Profile;
 
 import jp.tomorrowkey.android.gifplayer.BaseGifImage;
@@ -36,13 +37,13 @@ public class ImageFetcherBridge {
      * Creates a ImageFetcherBridge for accessing the native ImageFetcher implementation.
      */
     public ImageFetcherBridge(Profile profile) {
-        mNativeImageFetcherBridge = nativeInit(profile);
+        mNativeImageFetcherBridge = ImageFetcherBridgeJni.get().init(profile);
     }
 
     /** Cleans up native half of bridge. */
     public void destroy() {
         assert mNativeImageFetcherBridge != 0;
-        nativeDestroy(mNativeImageFetcherBridge);
+        ImageFetcherBridgeJni.get().destroy(mNativeImageFetcherBridge, ImageFetcherBridge.this);
         mNativeImageFetcherBridge = 0;
     }
 
@@ -54,7 +55,8 @@ public class ImageFetcherBridge {
      */
     public String getFilePath(String url) {
         assert mNativeImageFetcherBridge != 0;
-        return nativeGetFilePath(mNativeImageFetcherBridge, url);
+        return ImageFetcherBridgeJni.get().getFilePath(
+                mNativeImageFetcherBridge, ImageFetcherBridge.this, url);
     }
 
     /**
@@ -68,13 +70,14 @@ public class ImageFetcherBridge {
     public void fetchGif(@ImageFetcherConfig int config, String url, String clientName,
             Callback<BaseGifImage> callback) {
         assert mNativeImageFetcherBridge != 0;
-        nativeFetchImageData(mNativeImageFetcherBridge, config, url, clientName, (byte[] data) -> {
-            if (data == null || data.length == 0) {
-                callback.onResult(null);
-            }
-
-            callback.onResult(new BaseGifImage(data));
-        });
+        ImageFetcherBridgeJni.get().fetchImageData(mNativeImageFetcherBridge,
+                ImageFetcherBridge.this, config, url, clientName, (byte[] data) -> {
+                    if (data == null || data.length == 0) {
+                        callback.onResult(null);
+                    }
+
+                    callback.onResult(new BaseGifImage(data));
+                });
     }
 
     /**
@@ -91,9 +94,10 @@ public class ImageFetcherBridge {
     public void fetchImage(@ImageFetcherConfig int config, String url, String clientName, int width,
             int height, Callback<Bitmap> callback) {
         assert mNativeImageFetcherBridge != 0;
-        nativeFetchImage(mNativeImageFetcherBridge, config, url, clientName, (bitmap) -> {
-            callback.onResult(ImageFetcher.tryToResizeImage(bitmap, width, height));
-        });
+        ImageFetcherBridgeJni.get().fetchImage(mNativeImageFetcherBridge, ImageFetcherBridge.this,
+                config, url, clientName, (bitmap) -> {
+                    callback.onResult(ImageFetcher.tryToResizeImage(bitmap, width, height));
+                });
     }
 
     /**
@@ -104,7 +108,8 @@ public class ImageFetcherBridge {
      */
     public void reportEvent(String clientName, @ImageFetcherEvent int eventId) {
         assert mNativeImageFetcherBridge != 0;
-        nativeReportEvent(mNativeImageFetcherBridge, clientName, eventId);
+        ImageFetcherBridgeJni.get().reportEvent(
+                mNativeImageFetcherBridge, ImageFetcherBridge.this, clientName, eventId);
     }
 
     /**
@@ -116,7 +121,8 @@ public class ImageFetcherBridge {
      */
     public void reportCacheHitTime(String clientName, long startTimeMillis) {
         assert mNativeImageFetcherBridge != 0;
-        nativeReportCacheHitTime(mNativeImageFetcherBridge, clientName, startTimeMillis);
+        ImageFetcherBridgeJni.get().reportCacheHitTime(
+                mNativeImageFetcherBridge, ImageFetcherBridge.this, clientName, startTimeMillis);
     }
 
     /**
@@ -128,8 +134,8 @@ public class ImageFetcherBridge {
      */
     public void reportTotalFetchTimeFromNative(String clientName, long startTimeMillis) {
         assert mNativeImageFetcherBridge != 0;
-        nativeReportTotalFetchTimeFromNative(
-                mNativeImageFetcherBridge, clientName, startTimeMillis);
+        ImageFetcherBridgeJni.get().reportTotalFetchTimeFromNative(
+                mNativeImageFetcherBridge, ImageFetcherBridge.this, clientName, startTimeMillis);
     }
 
     /**
@@ -140,20 +146,24 @@ public class ImageFetcherBridge {
         sImageFetcherBridge = imageFetcherBridge;
     }
 
-    // Native methods
-    private static native long nativeInit(Profile profile);
-    private native void nativeDestroy(long nativeImageFetcherBridge);
-    private native String nativeGetFilePath(long nativeImageFetcherBridge, String url);
-    private native void nativeFetchImageData(long nativeImageFetcherBridge,
-            @ImageFetcherConfig int config, String url, String clientName,
-            Callback<byte[]> callback);
-    private native void nativeFetchImage(long nativeImageFetcherBridge,
-            @ImageFetcherConfig int config, String url, String clientName,
-            Callback<Bitmap> callback);
-    private native void nativeReportEvent(
-            long nativeImageFetcherBridge, String clientName, int eventId);
-    private native void nativeReportCacheHitTime(
-            long nativeImageFetcherBridge, String clientName, long startTimeMillis);
-    private native void nativeReportTotalFetchTimeFromNative(
-            long nativeImageFetcherBridge, String clientName, long startTimeMillis);
+    @NativeMethods
+    interface Natives {
+        // Native methods
+        long init(Profile profile);
+
+        void destroy(long nativeImageFetcherBridge, ImageFetcherBridge caller);
+        String getFilePath(long nativeImageFetcherBridge, ImageFetcherBridge caller, String url);
+        void fetchImageData(long nativeImageFetcherBridge, ImageFetcherBridge caller,
+                @ImageFetcherConfig int config, String url, String clientName,
+                Callback<byte[]> callback);
+        void fetchImage(long nativeImageFetcherBridge, ImageFetcherBridge caller,
+                @ImageFetcherConfig int config, String url, String clientName,
+                Callback<Bitmap> callback);
+        void reportEvent(long nativeImageFetcherBridge, ImageFetcherBridge caller,
+                String clientName, int eventId);
+        void reportCacheHitTime(long nativeImageFetcherBridge, ImageFetcherBridge caller,
+                String clientName, long startTimeMillis);
+        void reportTotalFetchTimeFromNative(long nativeImageFetcherBridge,
+                ImageFetcherBridge caller, String clientName, long startTimeMillis);
+    }
 }