Revert "Revert 158067 - Remove native side of content_view_client"

content/browser/android/content_view_core_impl.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_core_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/json/json_writer.h"
-#include "content/browser/android/content_view_client.h"
 #include "content/browser/android/load_url_params.h"
 #include "content/browser/android/touch_point.h"
 #include "content/browser/renderer_host/java/java_bound_object.h"
 #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
 #include "content/browser/web_contents/navigation_controller_impl.h"
 #include "content/browser/web_contents/web_contents_view_android.h"
 #include "content/public/browser/browser_context.h"
@@ skipping 434 matching lines @@
 }
 
 void ContentViewCoreImpl::ClearHistory(JNIEnv* env, jobject obj) {
   web_contents_->GetController().PruneAllButActive();
 }
 
 jboolean ContentViewCoreImpl::NeedsReload(JNIEnv* env, jobject obj) {
   return web_contents_->GetController().NeedsReload();
 }
 
-void ContentViewCoreImpl::SetClient(JNIEnv* env, jobject obj, jobject jclient) {
-  scoped_ptr<ContentViewClient> client(
-      ContentViewClient::CreateNativeContentViewClient(env, jclient));
-
-  content_view_client_.swap(client);
-}
-
 void ContentViewCoreImpl::AddJavascriptInterface(
     JNIEnv* env,
     jobject /* obj */,
     jobject object,
     jstring name,
     jboolean require_annotation) {
   ScopedJavaLocalRef<jobject> scoped_object(env, object);
   // JavaBoundObject creates the NPObject with a ref count of 1, and
   // JavaBridgeDispatcherHostManager takes its own ref.
   NPObject* bound_object = JavaBoundObject::Create(scoped_object,
@@ skipping 245 matching lines @@
   if (!HasField(env, clazz, "mNativeContentViewCore", "I")) {
     DLOG(ERROR) << "Unable to find ContentView.mNativeContentViewCore!";
     return false;
   }
   g_native_content_view = GetFieldID(env, clazz, "mNativeContentViewCore", "I");
 
   return RegisterNativesImpl(env) >= 0;
 }
 
 }  // namespace content