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

content/browser/android/content_view_client.cc

 // 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.
 
 #include "content/browser/android/content_view_client.h"
 
 #include <android/keycodes.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "content/browser/android/content_util.h"
-#include "content/browser/android/content_view_impl.h"
+#include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/android/download_controller.h"
 #include "content/browser/android/ime_utils.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/common/find_match_rect_android.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
@@ skipping 568 matching lines @@
 
 bool RegisterContentViewClient(JNIEnv* env) {
   if (!HasClass(env, kContentViewClientClassPath)) {
     DLOG(ERROR) << "Unable to find class ContentViewClient!";
     return false;
   }
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content