Android: Remove ContentViewCore::GetLayer() from public interface

content/browser/android/content_view_render_view.cc

Index: content/browser/android/content_view_render_view.cc
diff --git a/content/browser/android/content_view_render_view.cc b/content/browser/android/content_view_render_view.cc
index ed6a19c99a99d63663d68c16514f34d65e28e950..857fb6bc8f3176a3395cdb041f42ead039729689 100644
--- a/content/browser/android/content_view_render_view.cc
+++ b/content/browser/android/content_view_render_view.cc
@@ -16,10 +16,11 @@
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop.h"
 #include "cc/layers/layer.h"
-#include "content/browser/android/content_view_core_impl.h"
 #include "content/public/browser/android/compositor.h"
 #include "content/public/browser/android/content_view_layer_renderer.h"
+#include "content/public/browser/web_contents.h"
 #include "jni/ContentViewRenderView_jni.h"
+#include "ui/android/view_android.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/geometry/size.h"
 
@@ -58,15 +59,15 @@ void ContentViewRenderView::Destroy(JNIEnv* env,
   delete this;
 }
 
-void ContentViewRenderView::SetCurrentContentViewCore(
+void ContentViewRenderView::SetCurrentWebContents(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
-    jlong native_content_view_core) {
+    const JavaParamRef<jobject>& jweb_contents) {
   InitCompositor();
-  ContentViewCoreImpl* content_view_core =
-      reinterpret_cast<ContentViewCoreImpl*>(native_content_view_core);
-  compositor_->SetRootLayer(content_view_core ? content_view_core->GetLayer()
-                                              : scoped_refptr<cc::Layer>());
+  WebContents* web_contents = WebContents::FromJavaWebContents(jweb_contents);
+  compositor_->SetRootLayer(web_contents
+                                ? web_contents->GetNativeView()->GetLayer()
+                                : scoped_refptr<cc::Layer>());
 }
 
 void ContentViewRenderView::SurfaceCreated(JNIEnv* env,