Revert "Revert 146000 - 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 5c155fad11072f7e5be9e6fea2950f4037df5fca..dd48b8b5efd2c21af88c7c759dbe1c75f6d5fe52 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.h
+++ b/content/browser/renderer_host/render_widget_host_view_android.h
@@ -17,7 +17,7 @@ struct GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params;
 struct GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params;
 
 namespace content {
-class ContentViewImpl;
+class ContentViewCoreImpl;
 class RenderWidgetHost;
 class RenderWidgetHostImpl;
 struct NativeWebKeyboardEvent;
@@ -28,7 +28,7 @@ struct NativeWebKeyboardEvent;
 class RenderWidgetHostViewAndroid : public RenderWidgetHostViewBase {
  public:
   RenderWidgetHostViewAndroid(RenderWidgetHostImpl* widget,
-                              ContentViewImpl* content_view);
+                              ContentViewCoreImpl* content_view_core);
   virtual ~RenderWidgetHostViewAndroid();
 
   // RenderWidgetHostView implementation.
@@ -103,7 +103,7 @@ class RenderWidgetHostViewAndroid : public RenderWidgetHostViewBase {
 
   virtual void StartContentIntent(const GURL& content_url) OVERRIDE;
 
-  void SetContentView(ContentViewImpl* content_view);
+  void SetContentViewCore(ContentViewCoreImpl* content_view_core);
 
  private:
   // The model object.
@@ -112,8 +112,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.