Removing ContentViewCore dependencies from direct WebContents functions.

components/web_contents_delegate_android/web_contents_delegate_android.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 "components/web_contents_delegate_android/web_contents_delegate_android.h"
 
 #include <android/keycodes.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 300 matching lines @@
   return Java_WebContentsDelegateAndroid_takeFocus(
       env, obj.obj(), reverse);
 }
 
 void WebContentsDelegateAndroid::ShowRepostFormWarningDialog(
     WebContents* source) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);
   if (obj.is_null())
     return;
-  ScopedJavaLocalRef<jobject> content_view_core =
-      content::ContentViewCore::FromWebContents(source)->GetJavaObject();
-  if (content_view_core.is_null())
+  ScopedJavaLocalRef<jobject> web_contents = source->GetJavaWebContents();
+  if (web_contents.is_null())
     return;
   Java_WebContentsDelegateAndroid_showRepostFormWarningDialog(env, obj.obj(),
-      content_view_core.obj());
+      web_contents.obj());
 }
 
 void WebContentsDelegateAndroid::ToggleFullscreenModeForTab(
     WebContents* web_contents,
     bool enter_fullscreen) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);
   if (obj.is_null())
     return;
   Java_WebContentsDelegateAndroid_toggleFullscreenModeForTab(
@@ skipping 45 matching lines @@
 // Native JNI methods
 // ----------------------------------------------------------------------------
 
 // Register native methods
 
 bool RegisterWebContentsDelegateAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace web_contents_delegate_android