Add Java wrapper for RenderFrameHost

content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java

Index: content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java b/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java
index b7dc50638047944bc3d5274028ae1d971e4d2ee6..8dbcc808a39b45431edb0e5e84265a4f00ed6705 100644
--- a/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java
+++ b/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java
@@ -28,6 +28,7 @@ import org.chromium.content_public.browser.ImageDownloadCallback;
 import org.chromium.content_public.browser.JavaScriptCallback;
 import org.chromium.content_public.browser.MessagePortService;
 import org.chromium.content_public.browser.NavigationController;
+import org.chromium.content_public.browser.RenderFrameHost;
 import org.chromium.content_public.browser.SmartClipCallback;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.content_public.browser.WebContentsObserver;
@@ -43,9 +44,9 @@ import java.util.UUID;
  * object.
  */
 @JNINamespace("content")
-//TODO(tedchoc): Remove the package restriction once this class moves to a non-public content
+// TODO(tedchoc): Remove the package restriction once this class moves to a non-public content
 //               package whose visibility will be enforced via DEPS.
-/* package */ class WebContentsImpl implements WebContents {
+/* package */ public class WebContentsImpl implements WebContents {

[boliu, 2017/02/16 01:00:58]

this doesn't need to be public, after RFH stops importing this

[rwlbuis, 2017/03/01 21:53:57]

Done.

     private static final String PARCEL_VERSION_KEY = "version";
     private static final String PARCEL_WEBCONTENTS_KEY = "webcontents";
     private static final String PARCEL_PROCESS_GUARD_KEY = "processguard";
@@ -167,6 +168,15 @@ import java.util.UUID;
     }
 
     @Override
+    public RenderFrameHost getMainFrame() {
+        return nativeGetMainFrame(mNativeWebContentsAndroid);
+    }
+
+    public static WebContents fromRenderFrameHost(RenderFrameHost rfh) {
+        return nativeFromRenderFrameHost(rfh);
+    }
+
+    @Override
     public String getTitle() {
         return nativeGetTitle(mNativeWebContentsAndroid);
     }
@@ -540,6 +550,8 @@ import java.util.UUID;
 
     private static native WebContents nativeFromNativePtr(long webContentsAndroidPtr);
 
+    private native RenderFrameHost nativeGetMainFrame(long nativeWebContentsAndroid);
+    private static native WebContents nativeFromRenderFrameHost(RenderFrameHost rfh);
     private native String nativeGetTitle(long nativeWebContentsAndroid);
     private native String nativeGetVisibleURL(long nativeWebContentsAndroid);
     private native boolean nativeIsLoading(long nativeWebContentsAndroid);