Revert "Revert 146000 - Split out ContentViewCore from ContentView for embedders."

ui/gfx/native_widget_types.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_GFX_NATIVE_WIDGET_TYPES_H_
 #define UI_GFX_NATIVE_WIDGET_TYPES_H_
 #pragma once
 
 #include "build/build_config.h"
 
@@ skipping 71 matching lines @@
 
 #if defined(TOOLKIT_GTK)
 typedef struct _GdkCursor GdkCursor;
 typedef union _GdkEvent GdkEvent;
 typedef struct _GdkPixbuf GdkPixbuf;
 typedef struct _GdkRegion GdkRegion;
 typedef struct _GtkWidget GtkWidget;
 typedef struct _GtkWindow GtkWindow;
 #elif defined(OS_ANDROID)
 namespace content {
-class ContentView;
+class ContentViewCore;
 }
 #endif
 class SkBitmap;
 
 namespace gfx {
 
 #if defined(USE_AURA)
 typedef ui::Cursor NativeCursor;
 typedef aura::Window* NativeView;
 typedef aura::Window* NativeWindow;
@@ skipping 11 matching lines @@
 typedef NSWindow* NativeWindow;
 typedef NSEvent* NativeEvent;
 #elif defined(TOOLKIT_GTK)
 typedef GdkCursor* NativeCursor;
 typedef GtkWidget* NativeView;
 typedef GtkWindow* NativeWindow;
 typedef GdkRegion* NativeRegion;
 typedef GdkEvent* NativeEvent;
 #elif defined(OS_ANDROID)
 typedef void* NativeCursor;
-typedef content::ContentView* NativeView;
-typedef content::ContentView* NativeWindow;
+typedef content::ContentViewCore* NativeView;
+typedef content::ContentViewCore* NativeWindow;
 typedef void* NativeRegion;
 typedef jobject NativeEvent;
 #endif
 
 #if defined(OS_WIN)
 typedef HFONT NativeFont;
 typedef HWND NativeEditView;
 typedef HDC NativeDrawingContext;
 typedef HMENU NativeMenu;
 typedef IAccessible* NativeViewAccessible;
@@ skipping 147 matching lines @@
 #elif defined(OS_ANDROID)
 typedef uint64 AcceleratedWidget;
 const AcceleratedWidget kNullAcceleratedWidget = 0;
 #else
 #error unknown platform
 #endif
 
 }  // namespace gfx
 
 #endif  // UI_GFX_NATIVE_WIDGET_TYPES_H_