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

content/content_browser.gypi

 # 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.
 
 {
   'dependencies': [
     'browser/debugger/devtools_resources.gyp:devtools_resources',
     'browser/speech/proto/speech_proto.gyp:speech_proto',
     '../base/base.gyp:base_static',
     '../crypto/crypto.gyp:crypto',
@@ skipping 12 matching lines @@
     '../webkit/support/webkit_support.gyp:webkit_strings',
   ],
   'include_dirs': [
     '..',
     '<(INTERMEDIATE_DIR)',
   ],
   'sources': [
     'port/browser/render_view_host_delegate_view.h',
     'port/browser/render_widget_host_view_port.h',
     'public/browser/access_token_store.h',
+    'public/browser/android/content_view_core.h',
     'public/browser/browser_accessibility_state.h',
     'public/browser/browser_child_process_host.h',
     'public/browser/browser_child_process_host_delegate.cc',
     'public/browser/browser_child_process_host_delegate.h',
     'public/browser/browser_child_process_host_iterator.cc',
     'public/browser/browser_child_process_host_iterator.h',
     'public/browser/browser_context.h',
     'public/browser/browser_main_parts.cc',
     'public/browser/browser_main_parts.h',
     'public/browser/browser_main_runner.h',
     'public/browser/browser_message_filter.cc',
     'public/browser/browser_message_filter.h',
     'public/browser/browser_shutdown.h',
     'public/browser/browser_url_handler.h',
     'public/browser/browser_thread.h',
     'public/browser/browser_thread_delegate.h',
     'public/browser/cert_store.h',
     'public/browser/child_process_data.h',
     'public/browser/child_process_security_policy.h',
     'public/browser/color_chooser.h',
     'public/browser/content_browser_client.cc',
     'public/browser/content_browser_client.h',
     'public/browser/content_ipc_logging.h',
-    'public/browser/android/content_view.h',
     'public/browser/devtools_agent_host_registry.h',
     'public/browser/devtools_client_host.h',
     'public/browser/download_danger_type.h',
     'public/browser/download_id.h',
     'public/browser/devtools_frontend_host_delegate.h',
     'public/browser/devtools_http_handler.h',
     'public/browser/devtools_http_handler_delegate.h',
     'public/browser/devtools_manager.h',
     'public/browser/dom_operation_notification_details.h',
     'public/browser/dom_storage_context.h',
@@ skipping 124 matching lines @@
     'browser/android/browser_jni_registrar.cc',
     'browser/android/browser_jni_registrar.h',
     'browser/android/content_settings.cc',
     'browser/android/content_settings.h',
     'browser/android/content_startup_flags.cc',
     'browser/android/content_startup_flags.h',
     'browser/android/content_util.cc',
     'browser/android/content_util.h',
     'browser/android/content_view_client.cc',
     'browser/android/content_view_client.h',
-    'browser/android/content_view_impl.cc',
-    'browser/android/content_view_impl.h',
+    'browser/android/content_view_core_impl.cc',
+    'browser/android/content_view_core_impl.h',
     'browser/android/download_controller.cc',
     'browser/android/download_controller.h',
     'browser/android/ime_utils.cc',
     'browser/android/ime_utils.h',
     'browser/android/sandboxed_process_launcher.cc',
     'browser/android/sandboxed_process_launcher.h',
     'browser/android/touch_point.cc',
     'browser/android/touch_point.h',
     'browser/appcache/appcache_dispatcher_host.cc',
     'browser/appcache/appcache_dispatcher_host.h',
@@ skipping 766 matching lines @@
       ],
     }],
     ['input_speech==0', {
       'sources/': [
         ['exclude', '^browser/speech/'],
       ],
     }],
   ],
 }