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

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

Bug: 929661
Change-Id: Iad5d2c2c4d2c5a7ae1ed8cf6a844abf8b8946374
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1808592
Commit-Queue: Eric Stevenson <estevenson@chromium.org>
Auto-Submit: Eric Stevenson <estevenson@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#697612}

weblayer/browser/java/BUILD.gn

@@ -22,9 +22,11 @@ android_library("java") {
   deps = [
     ":client_java",
     "//base:base_java",
+    "//base:jni_java",
     "//content/public/android:content_java",
     "//ui/android:ui_java",
   ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }
 
 generate_jni("jni") {

weblayer/browser/java/org/chromium/weblayer_private/BrowserControllerImpl.java

@@ -15,6 +15,7 @@ import android.view.ViewGroup.LayoutParams;
 import android.widget.FrameLayout;
 
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 import org.chromium.content_public.browser.ViewEventSink;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.ui.base.ActivityWindowAndroid;
@@ -78,8 +79,10 @@ public final class BrowserControllerImpl extends IBrowserController.Stub {
         mContentViewRenderView.onNativeLibraryLoaded(
                 mWindowAndroid, ContentViewRenderView.MODE_SURFACE_VIEW);
 
-        mNativeBrowserController = nativeCreateBrowserController(profile.getNativeProfile());
-        mWebContents = nativeGetWebContents(mNativeBrowserController);
+        mNativeBrowserController =
+                BrowserControllerImplJni.get().createBrowserController(profile.getNativeProfile());
+        mWebContents = BrowserControllerImplJni.get().getWebContents(
+                mNativeBrowserController, BrowserControllerImpl.this);
         mTopControlsContainerView =
                 new TopControlsContainerView(context, mWebContents, mContentViewRenderView);
         mContentView = ContentView.createContentView(
@@ -100,8 +103,8 @@ public final class BrowserControllerImpl extends IBrowserController.Stub {
                 new FrameLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT,
                         FrameLayout.LayoutParams.UNSPECIFIED_GRAVITY));
 
-        nativeSetTopControlsContainerView(
-                mNativeBrowserController, mTopControlsContainerView.getNativeHandle());
+        BrowserControllerImplJni.get().setTopControlsContainerView(mNativeBrowserController,
+                BrowserControllerImpl.this, mTopControlsContainerView.getNativeHandle());
         mContentView.addView(mTopControlsContainerView,
                 new FrameLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT,
                         Gravity.FILL_HORIZONTAL | Gravity.TOP));
@@ -129,13 +132,14 @@ public final class BrowserControllerImpl extends IBrowserController.Stub {
 
     @Override
     public void destroy() {
-        nativeSetTopControlsContainerView(mNativeBrowserController, 0);
+        BrowserControllerImplJni.get().setTopControlsContainerView(
+                mNativeBrowserController, BrowserControllerImpl.this, 0);
         mContentViewRenderView.destroy();
         mTopControlsContainerView.destroy();
         if (mBrowserObserverProxy != null) mBrowserObserverProxy.destroy();
         mBrowserObserverProxy = null;
         mNavigationController = null;
-        nativeDeleteBrowserController(mNativeBrowserController);
+        BrowserControllerImplJni.get().deleteBrowserController(mNativeBrowserController);
         mNativeBrowserController = 0;
     }
 
@@ -156,9 +160,12 @@ public final class BrowserControllerImpl extends IBrowserController.Stub {
                                                   : ContentViewRenderView.MODE_SURFACE_VIEW);
     }
 
-    private static native long nativeCreateBrowserController(long profile);
-    private native void nativeSetTopControlsContainerView(
-            long nativeBrowserControllerImpl, long nativeTopControlsContainerView);
-    private static native void nativeDeleteBrowserController(long browserController);
-    private native WebContents nativeGetWebContents(long nativeBrowserControllerImpl);
+    @NativeMethods
+    interface Natives {
+        long createBrowserController(long profile);
+        void setTopControlsContainerView(long nativeBrowserControllerImpl,
+                BrowserControllerImpl caller, long nativeTopControlsContainerView);
+        void deleteBrowserController(long browserController);
+        WebContents getWebContents(long nativeBrowserControllerImpl, BrowserControllerImpl caller);
+    }
 }

weblayer/browser/java/org/chromium/weblayer_private/BrowserObserverProxy.java

@@ -8,6 +8,7 @@ import android.os.RemoteException;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 import org.chromium.weblayer_private.aidl.APICallException;
 import org.chromium.weblayer_private.aidl.IBrowserControllerClient;
 
@@ -23,11 +24,12 @@ public final class BrowserObserverProxy {
 
     BrowserObserverProxy(long browserController, IBrowserControllerClient client) {
         mClient = client;
-        mNativeBrowserObserverProxy = nativeCreateBrowserObserverProxy(this, browserController);
+        mNativeBrowserObserverProxy =
+                BrowserObserverProxyJni.get().createBrowserObserverProxy(this, browserController);
     }
 
     public void destroy() {
-        nativeDeleteBrowserObserverProxy(mNativeBrowserObserverProxy);
+        BrowserObserverProxyJni.get().deleteBrowserObserverProxy(mNativeBrowserObserverProxy);
         mNativeBrowserObserverProxy = 0;
     }
 
@@ -40,7 +42,9 @@ public final class BrowserObserverProxy {
         }
     }
 
-    private static native long nativeCreateBrowserObserverProxy(
-            BrowserObserverProxy proxy, long browserController);
-    private static native void nativeDeleteBrowserObserverProxy(long proxy);
+    @NativeMethods
+    interface Natives {
+        long createBrowserObserverProxy(BrowserObserverProxy proxy, long browserController);
+        void deleteBrowserObserverProxy(long proxy);
+    }
 }

weblayer/browser/java/org/chromium/weblayer_private/ContentViewRenderView.java

@@ -18,6 +18,7 @@ import androidx.annotation.IntDef;
 
 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;
 import org.chromium.ui.resources.ResourceManager;
@@ -86,7 +87,8 @@ public class ContentViewRenderView extends FrameLayout {
      */
     public void onNativeLibraryLoaded(WindowAndroid rootWindow, @Mode int mode) {
         assert rootWindow != null;
-        mNativeContentViewRenderView = nativeInit(rootWindow);
+        mNativeContentViewRenderView =
+                ContentViewRenderViewJni.get().init(ContentViewRenderView.this, rootWindow);
         assert mNativeContentViewRenderView != 0;
         mWindowAndroid = rootWindow;
         requestMode(mode);
@@ -286,7 +288,8 @@ public class ContentViewRenderView extends FrameLayout {
         uninitializeSurfaceView();
         uninitializeTextureView();
         mWindowAndroid = null;
-        nativeDestroy(mNativeContentViewRenderView);
+        ContentViewRenderViewJni.get().destroy(
+                mNativeContentViewRenderView, ContentViewRenderView.this);
         mNativeContentViewRenderView = 0;
     }
 
@@ -296,35 +299,41 @@ 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);
     }
 
     public ResourceManager getResourceManager() {
-        return nativeGetResourceManager(mNativeContentViewRenderView);
+        return ContentViewRenderViewJni.get().getResourceManager(
+                mNativeContentViewRenderView, ContentViewRenderView.this);
     }
 
     private void surfaceCreated() {
         assert mNativeContentViewRenderView != 0;
-        nativeSurfaceCreated(mNativeContentViewRenderView);
+        ContentViewRenderViewJni.get().surfaceCreated(
+                mNativeContentViewRenderView, ContentViewRenderView.this);
     }
 
     private void surfaceChanged(
             Surface surface, boolean canBeUsedWithSurfaceControl, int width, int height) {
         assert mNativeContentViewRenderView != 0;
-        nativeSurfaceChanged(
-                mNativeContentViewRenderView, canBeUsedWithSurfaceControl, width, height, surface);
+        ContentViewRenderViewJni.get().surfaceChanged(mNativeContentViewRenderView,
+                ContentViewRenderView.this, canBeUsedWithSurfaceControl, width, height, surface);
         if (mWebContents != null) {
-            nativeOnPhysicalBackingSizeChanged(
-                    mNativeContentViewRenderView, mWebContents, width, height);
+            ContentViewRenderViewJni.get().onPhysicalBackingSizeChanged(
+                    mNativeContentViewRenderView, ContentViewRenderView.this, mWebContents, width,
+                    height);
         }
     }
 
     private void surfaceDestroyed() {
         assert mNativeContentViewRenderView != 0;
-        nativeSurfaceDestroyed(mNativeContentViewRenderView);
+        ContentViewRenderViewJni.get().surfaceDestroyed(
+                mNativeContentViewRenderView, ContentViewRenderView.this);
     }
 
     @CalledByNative
@@ -343,15 +352,19 @@ public class ContentViewRenderView extends FrameLayout {
         return mNativeContentViewRenderView;
     }
 
-    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,
-            boolean canBeUsedWithSurfaceControl, int width, int height, Surface surface);
-    private native ResourceManager nativeGetResourceManager(long nativeContentViewRenderView);
+    @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,
+                boolean canBeUsedWithSurfaceControl, int width, int height, Surface surface);
+        ResourceManager getResourceManager(
+                long nativeContentViewRenderView, ContentViewRenderView caller);
+    }
 }

weblayer/browser/java/org/chromium/weblayer_private/NavigationControllerImpl.java

@@ -8,6 +8,7 @@ import android.os.RemoteException;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 import org.chromium.weblayer_private.aidl.APICallException;
 import org.chromium.weblayer_private.aidl.INavigationController;
 import org.chromium.weblayer_private.aidl.INavigationControllerClient;
@@ -25,49 +26,58 @@ public final class NavigationControllerImpl extends INavigationController.Stub {
             BrowserControllerImpl browserController, INavigationControllerClient client) {
         mNavigationControllerClient = client;
         mBrowserController = browserController;
-        mNativeNavigationController =
-                nativeGetNavigationController(browserController.getNativeBrowserController());
-        nativeSetNavigationControllerImpl(mNativeNavigationController);
+        mNativeNavigationController = NavigationControllerImplJni.get().getNavigationController(
+                browserController.getNativeBrowserController());
+        NavigationControllerImplJni.get().setNavigationControllerImpl(
+                mNativeNavigationController, NavigationControllerImpl.this);
     }
 
     @Override
     public void navigate(String uri) {
-        nativeNavigate(mNativeNavigationController, uri);
+        NavigationControllerImplJni.get().navigate(
+                mNativeNavigationController, NavigationControllerImpl.this, uri);
     }
 
     @Override
     public void goBack() {
-        nativeGoBack(mNativeNavigationController);
+        NavigationControllerImplJni.get().goBack(
+                mNativeNavigationController, NavigationControllerImpl.this);
     }
 
     @Override
     public void goForward() {
-        nativeGoForward(mNativeNavigationController);
+        NavigationControllerImplJni.get().goForward(
+                mNativeNavigationController, NavigationControllerImpl.this);
     }
 
     @Override
     public void reload() {
-        nativeReload(mNativeNavigationController);
+        NavigationControllerImplJni.get().reload(
+                mNativeNavigationController, NavigationControllerImpl.this);
     }
 
     @Override
     public void stop() {
-        nativeStop(mNativeNavigationController);
+        NavigationControllerImplJni.get().stop(
+                mNativeNavigationController, NavigationControllerImpl.this);
     }
 
     @Override
     public int getNavigationListSize() {
-        return nativeGetNavigationListSize(mNativeNavigationController);
+        return NavigationControllerImplJni.get().getNavigationListSize(
+                mNativeNavigationController, NavigationControllerImpl.this);
     }
 
     @Override
     public int getNavigationListCurrentIndex() {
-        return nativeGetNavigationListCurrentIndex(mNativeNavigationController);
+        return NavigationControllerImplJni.get().getNavigationListCurrentIndex(
+                mNativeNavigationController, NavigationControllerImpl.this);
     }
 
     @Override
     public String getNavigationEntryDisplayUri(int index) {
-        return nativeGetNavigationEntryDisplayUri(mNativeNavigationController, index);
+        return NavigationControllerImplJni.get().getNavigationEntryDisplayUri(
+                mNativeNavigationController, NavigationControllerImpl.this, index);
     }
 
     @CalledByNative
@@ -120,16 +130,22 @@ public final class NavigationControllerImpl extends INavigationController.Stub {
         }
     }
 
-    private native void nativeSetNavigationControllerImpl(long nativeNavigationControllerImpl);
-
-    private static native long nativeGetNavigationController(long browserController);
-    private native void nativeNavigate(long nativeNavigationControllerImpl, String uri);
-    private native void nativeGoBack(long nativeNavigationControllerImpl);
-    private native void nativeGoForward(long nativeNavigationControllerImpl);
-    private native void nativeReload(long nativeNavigationControllerImpl);
-    private native void nativeStop(long nativeNavigationControllerImpl);
-    private native int nativeGetNavigationListSize(long nativeNavigationControllerImpl);
-    private native int nativeGetNavigationListCurrentIndex(long nativeNavigationControllerImpl);
-    private native String nativeGetNavigationEntryDisplayUri(
-            long nativeNavigationControllerImpl, int index);
+    @NativeMethods
+    interface Natives {
+        void setNavigationControllerImpl(
+                long nativeNavigationControllerImpl, NavigationControllerImpl caller);
+        long getNavigationController(long browserController);
+        void navigate(
+                long nativeNavigationControllerImpl, NavigationControllerImpl caller, String uri);
+        void goBack(long nativeNavigationControllerImpl, NavigationControllerImpl caller);
+        void goForward(long nativeNavigationControllerImpl, NavigationControllerImpl caller);
+        void reload(long nativeNavigationControllerImpl, NavigationControllerImpl caller);
+        void stop(long nativeNavigationControllerImpl, NavigationControllerImpl caller);
+        int getNavigationListSize(
+                long nativeNavigationControllerImpl, NavigationControllerImpl caller);
+        int getNavigationListCurrentIndex(
+                long nativeNavigationControllerImpl, NavigationControllerImpl caller);
+        String getNavigationEntryDisplayUri(
+                long nativeNavigationControllerImpl, NavigationControllerImpl caller, int index);
+    }
 }

weblayer/browser/java/org/chromium/weblayer_private/NavigationImpl.java

@@ -8,6 +8,7 @@ import android.os.RemoteException;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 import org.chromium.weblayer_private.aidl.APICallException;
 import org.chromium.weblayer_private.aidl.IClientNavigation;
 import org.chromium.weblayer_private.aidl.INavigation;
@@ -28,7 +29,7 @@ public final class NavigationImpl extends INavigation.Stub {
         } catch (RemoteException e) {
             throw new APICallException(e);
         }
-        nativeSetJavaNavigation(mNativeNavigationImpl);
+        NavigationImplJni.get().setJavaNavigation(mNativeNavigationImpl, NavigationImpl.this);
     }
 
     public IClientNavigation getClientNavigation() {
@@ -38,19 +39,19 @@ public final class NavigationImpl extends INavigation.Stub {
     @Override
     public int getState() {
         throwIfNativeDestroyed();
-        return nativeGetState(mNativeNavigationImpl);
+        return NavigationImplJni.get().getState(mNativeNavigationImpl, NavigationImpl.this);
     }
 
     @Override
     public String getUri() {
         throwIfNativeDestroyed();
-        return nativeGetUri(mNativeNavigationImpl);
+        return NavigationImplJni.get().getUri(mNativeNavigationImpl, NavigationImpl.this);
     }
 
     @Override
     public List<String> getRedirectChain() {
         throwIfNativeDestroyed();
-        return nativeGetRedirectChain(mNativeNavigationImpl);
+        return NavigationImplJni.get().getRedirectChain(mNativeNavigationImpl, NavigationImpl.this);
     }
 
     private void throwIfNativeDestroyed() {
@@ -65,8 +66,11 @@ public final class NavigationImpl extends INavigation.Stub {
         // TODO: this should likely notify delegate in some way.
     }
 
-    private native void nativeSetJavaNavigation(long nativeNavigationImpl);
-    private native int nativeGetState(long nativeNavigationImpl);
-    private native String nativeGetUri(long nativeNavigationImpl);
-    private native List<String> nativeGetRedirectChain(long nativeNavigationImpl);
+    @NativeMethods
+    interface Natives {
+        void setJavaNavigation(long nativeNavigationImpl, NavigationImpl caller);
+        int getState(long nativeNavigationImpl, NavigationImpl caller);
+        String getUri(long nativeNavigationImpl, NavigationImpl caller);
+        List<String> getRedirectChain(long nativeNavigationImpl, NavigationImpl caller);
+    }
 }

weblayer/browser/java/org/chromium/weblayer_private/ProfileImpl.java

@@ -7,6 +7,7 @@ package org.chromium.weblayer_private;
 import android.content.Context;
 
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 import org.chromium.weblayer_private.aidl.IBrowserController;
 import org.chromium.weblayer_private.aidl.IObjectWrapper;
 import org.chromium.weblayer_private.aidl.IProfile;
@@ -17,18 +18,18 @@ public final class ProfileImpl extends IProfile.Stub {
     private long mNativeProfile;
 
     public ProfileImpl(String path) {
-        mNativeProfile = nativeCreateProfile(path);
+        mNativeProfile = ProfileImplJni.get().createProfile(path);
     }
 
     @Override
     public void destroy() {
-        nativeDeleteProfile(mNativeProfile);
+        ProfileImplJni.get().deleteProfile(mNativeProfile);
         mNativeProfile = 0;
     }
 
     @Override
     public void clearBrowsingData() {
-        nativeClearBrowsingData(mNativeProfile);
+        ProfileImplJni.get().clearBrowsingData(mNativeProfile);
     }
 
     @Override
@@ -42,9 +43,10 @@ public final class ProfileImpl extends IProfile.Stub {
         return mNativeProfile;
     }
 
-    private static native long nativeCreateProfile(String path);
-
-    private static native void nativeDeleteProfile(long profile);
-
-    private static native void nativeClearBrowsingData(long nativeProfileImpl);
+    @NativeMethods
+    interface Natives {
+        long createProfile(String path);
+        void deleteProfile(long profile);
+        void clearBrowsingData(long nativeProfileImpl);
+    }
 }

weblayer/browser/java/org/chromium/weblayer_private/TopControlsContainerView.java

@@ -13,6 +13,7 @@ import android.view.ViewParent;
 import android.widget.FrameLayout;
 
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.annotations.NativeMethods;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.ui.resources.dynamics.ViewResourceAdapter;
 
@@ -50,7 +51,8 @@ class TopControlsContainerView extends FrameLayout {
 
     // Used to  delay updating the image for the layer.
     private final Runnable mRefreshResourceIdRunnable = () -> {
-        nativeUpdateTopControlsResource(mNativeTopControlsContainerView);
+        TopControlsContainerViewJni.get().updateTopControlsResource(
+                mNativeTopControlsContainerView, TopControlsContainerView.this);
     };
 
     TopControlsContainerView(
@@ -70,13 +72,15 @@ class TopControlsContainerView extends FrameLayout {
                         mWebContents.getEventForwarder().setCurrentTouchEventOffsets(0, top);
                     }
                 });
-        mNativeTopControlsContainerView = nativeCreateTopControlsContainerView(
-                webContents, contentViewRenderView.getNativeHandle());
+        mNativeTopControlsContainerView =
+                TopControlsContainerViewJni.get().createTopControlsContainerView(
+                        webContents, contentViewRenderView.getNativeHandle());
     }
 
     public void destroy() {
         setView(null);
-        nativeDeleteTopControlsContainerView(mNativeTopControlsContainerView);
+        TopControlsContainerViewJni.get().deleteTopControlsContainerView(
+                mNativeTopControlsContainerView, TopControlsContainerView.this);
     }
 
     public long getNativeHandle() {
@@ -96,7 +100,8 @@ class TopControlsContainerView extends FrameLayout {
             if (mView.getParent() == this) removeView(mView);
             // TODO: need some sort of destroy to drop reference.
             mViewResourceAdapter = null;
-            nativeDeleteTopControlsLayer(mNativeTopControlsContainerView);
+            TopControlsContainerViewJni.get().deleteTopControlsLayer(
+                    mNativeTopControlsContainerView, TopControlsContainerView.this);
             mContentViewRenderView.getResourceManager()
                     .getDynamicResourceLoader()
                     .unregisterResource(TOP_CONTROLS_ID);
@@ -154,8 +159,9 @@ class TopControlsContainerView extends FrameLayout {
                 if (mViewResourceAdapter == null) {
                     createAdapterAndLayer();
                 } else {
-                    nativeSetTopControlsSize(
-                            mNativeTopControlsContainerView, mLastWidth, mLastHeight);
+                    TopControlsContainerViewJni.get().setTopControlsSize(
+                            mNativeTopControlsContainerView, TopControlsContainerView.this,
+                            mLastWidth, mLastHeight);
                 }
             }
         }
@@ -183,10 +189,12 @@ class TopControlsContainerView extends FrameLayout {
         // It's important that the layer is created immediately and always kept in sync with the
         // View. Creating the layer only when needed results in a noticeable delay between when
         // the layer is created and actually shown. Chrome for Android does the same thing.
-        nativeCreateTopControlsLayer(mNativeTopControlsContainerView, TOP_CONTROLS_ID);
+        TopControlsContainerViewJni.get().createTopControlsLayer(
+                mNativeTopControlsContainerView, TopControlsContainerView.this, TOP_CONTROLS_ID);
         mLastWidth = getWidth();
         mLastHeight = getHeight();
-        nativeSetTopControlsSize(mNativeTopControlsContainerView, mLastWidth, mLastHeight);
+        TopControlsContainerViewJni.get().setTopControlsSize(mNativeTopControlsContainerView,
+                TopControlsContainerView.this, mLastWidth, mLastHeight);
     }
 
     private void finishTopControlsScroll(int topContentOffsetY) {
@@ -197,8 +205,8 @@ class TopControlsContainerView extends FrameLayout {
 
     private void setTopControlsOffset(int topControlsOffsetY, int topContentOffsetY) {
         mTopContentOffset = topContentOffsetY;
-        nativeSetTopControlsOffset(
-                mNativeTopControlsContainerView, topControlsOffsetY, topContentOffsetY);
+        TopControlsContainerViewJni.get().setTopControlsOffset(mNativeTopControlsContainerView,
+                TopControlsContainerView.this, topControlsOffsetY, topContentOffsetY);
     }
 
     private void prepareForTopControlsScroll() {
@@ -214,14 +222,21 @@ class TopControlsContainerView extends FrameLayout {
         if (mView != null) mView.setVisibility(View.VISIBLE);
     }
 
-    private static native long nativeCreateTopControlsContainerView(
-            WebContents webContents, long nativeContentViewRenderView);
-    private native void nativeDeleteTopControlsContainerView(long nativeTopControlsContainerView);
-    private native void nativeCreateTopControlsLayer(long nativeTopControlsContainerView, int id);
-    private native void nativeDeleteTopControlsLayer(long nativeTopControlsContainerView);
-    private native void nativeSetTopControlsOffset(
-            long nativeTopControlsContainerView, int topControlsOffsetY, int topContentOffsetY);
-    private native void nativeSetTopControlsSize(
-            long nativeTopControlsContainerView, int width, int height);
-    private native void nativeUpdateTopControlsResource(long nativeTopControlsContainerView);
+    @NativeMethods
+    interface Natives {
+        long createTopControlsContainerView(
+                WebContents webContents, long nativeContentViewRenderView);
+        void deleteTopControlsContainerView(
+                long nativeTopControlsContainerView, TopControlsContainerView caller);
+        void createTopControlsLayer(
+                long nativeTopControlsContainerView, TopControlsContainerView caller, int id);
+        void deleteTopControlsLayer(
+                long nativeTopControlsContainerView, TopControlsContainerView caller);
+        void setTopControlsOffset(long nativeTopControlsContainerView,
+                TopControlsContainerView caller, int topControlsOffsetY, int topContentOffsetY);
+        void setTopControlsSize(long nativeTopControlsContainerView,
+                TopControlsContainerView caller, int width, int height);
+        void updateTopControlsResource(
+                long nativeTopControlsContainerView, TopControlsContainerView caller);
+    }
 }