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
===================================================================
--- content/browser/renderer_host/render_widget_host_view_android.h	(revision 146004)
+++ content/browser/renderer_host/render_widget_host_view_android.h	(working copy)
@@ -18,7 +18,7 @@
 struct GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params;
 
 namespace content {
-class ContentViewCoreImpl;
+class ContentViewImpl;
 class RenderWidgetHost;
 class RenderWidgetHostImpl;
 struct NativeWebKeyboardEvent;
@@ -29,7 +29,7 @@
 class RenderWidgetHostViewAndroid : public RenderWidgetHostViewBase {
  public:
   RenderWidgetHostViewAndroid(RenderWidgetHostImpl* widget,
-                              ContentViewCoreImpl* content_view_core);
+                              ContentViewImpl* content_view);
   virtual ~RenderWidgetHostViewAndroid();
 
   // RenderWidgetHostView implementation.
@@ -102,7 +102,7 @@
   virtual bool LockMouse() OVERRIDE;
   virtual void UnlockMouse() OVERRIDE;
 
-  void SetContentViewCore(ContentViewCoreImpl* content_view_core);
+  void SetContentView(ContentViewImpl* content_view);
 
  private:
   // The model object.
@@ -111,8 +111,8 @@
   // Whether or not this widget is hidden.
   bool is_hidden_;
 
-  // ContentViewCoreImpl is our interface to the view system.
-  ContentViewCoreImpl* content_view_core_;
+  // ContentViewImpl is our interface to the view system.
+  ContentViewImpl* content_view_;
 
   // The size that we want the renderer to be.  We keep this in a separate
   // variable because resizing is async.