Split out ContentViewCore from ContentView for embedders.

content/browser/renderer_host/render_widget_host_view_android.h

Index: content/browser/renderer_host/render_widget_host_view_android.h
diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/content/browser/renderer_host/render_widget_host_view_android.h
index 51e380b324a38caa0d478dcf7706c1610d9e7163..7cb604dd4916bccb15840a97c32775f201d9890f 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.h
+++ b/content/browser/renderer_host/render_widget_host_view_android.h
@@ -18,7 +18,7 @@ struct GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params;
 struct GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params;
 
 namespace content {
-class ContentViewImpl;
+class ContentViewCoreImpl;
 class RenderWidgetHost;
 class RenderWidgetHostImpl;
 struct NativeWebKeyboardEvent;
@@ -29,7 +29,7 @@ struct NativeWebKeyboardEvent;
 class RenderWidgetHostViewAndroid : public RenderWidgetHostViewBase {
  public:
   RenderWidgetHostViewAndroid(RenderWidgetHostImpl* widget,
-                              ContentViewImpl* content_view);
+                              ContentViewCoreImpl* content_view_core);
   virtual ~RenderWidgetHostViewAndroid();
 
   // RenderWidgetHostView implementation.
@@ -102,7 +102,7 @@ class RenderWidgetHostViewAndroid : public RenderWidgetHostViewBase {
   virtual bool LockMouse() OVERRIDE;
   virtual void UnlockMouse() OVERRIDE;
 
-  void SetContentView(ContentViewImpl* content_view);
+  void SetContentViewCore(ContentViewCoreImpl* content_view_core);
 
  private:
   // The model object.
@@ -111,8 +111,8 @@ class RenderWidgetHostViewAndroid : public RenderWidgetHostViewBase {
   // Whether or not this widget is hidden.
   bool is_hidden_;
 
-  // ContentViewImpl is our interface to the view system.
-  ContentViewImpl* content_view_;
+  // ContentViewCoreImpl is our interface to the view system.
+  ContentViewCoreImpl* content_view_core_;
 
   // The size that we want the renderer to be.  We keep this in a separate
   // variable because resizing is async.