Revert 146000 - Split out ContentViewCore from ContentView for embedders.

content/browser/web_contents/web_contents_view_android.h

Index: content/browser/web_contents/web_contents_view_android.h
===================================================================
--- content/browser/web_contents/web_contents_view_android.h	(revision 146004)
+++ content/browser/web_contents/web_contents_view_android.h	(working copy)
@@ -14,7 +14,7 @@
 #include "content/public/common/context_menu_params.h"
 
 namespace content {
-class ContentViewCoreImpl;
+class ContentViewImpl;
 
 // Android-specific implementation of the WebContentsView.
 class WebContentsViewAndroid : public WebContentsView,
@@ -24,10 +24,10 @@
                          WebContentsViewDelegate* delegate);
   virtual ~WebContentsViewAndroid();
 
-  // Sets the interface to the view system. ContentViewCoreImpl is owned
-  // by its Java ContentViewCore counterpart, whose lifetime is managed
+  // Sets the interface to the view system. ContentViewImpl is owned
+  // by its Java ContentView counterpart, whose lifetime is managed
   // by the UI frontend.
-  void SetContentViewCore(ContentViewCoreImpl* content_view_core);
+  void SetContentView(ContentViewImpl* content_view);
 
   // WebContentsView implementation --------------------------------------------
 
@@ -75,8 +75,8 @@
   // The WebContents whose contents we display.
   WebContentsImpl* web_contents_;
 
-  // ContentViewCoreImpl is our interface to the view system.
-  ContentViewCoreImpl* content_view_core_;
+  // ContentViewImpl is our interface to the view system.
+  ContentViewImpl* content_view_;
 
   // Interface for extensions to WebContentsView. Used to show the context menu.
   scoped_ptr<WebContentsViewDelegate> delegate_;