Removing ContentViewCore dependencies from few functions which acts as direct wrapper to WebContents

content/browser/android/content_view_core_impl.cc

 // Copyright 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"
@@ skipping 801 matching lines @@
 }
 
 scoped_refptr<cc::Layer> ContentViewCoreImpl::GetLayer() const {
   return root_layer_.get();
 }
 
 // ----------------------------------------------------------------------------
 // Methods called from Java via JNI
 // ----------------------------------------------------------------------------
 
-void ContentViewCoreImpl::SelectPopupMenuItems(JNIEnv* env, jobject obj,
-                                               jintArray indices) {
+void ContentViewCoreImpl::SelectPopupMenuItems(
+    JNIEnv* env,
+    jobject obj,
+    jintArray indices) {
   RenderViewHostImpl* rvhi = static_cast<RenderViewHostImpl*>(
       web_contents_->GetRenderViewHost());
   DCHECK(rvhi);
   if (indices == NULL) {
     rvhi->DidCancelPopupMenu();
     return;
   }
 
   int selected_count = env->GetArrayLength(indices);
   std::vector<int> selected_indices;
@@ skipping 54 matching lines @@
     params.referrer = content::Referrer(
         GURL(ConvertJavaStringToUTF8(env, j_referrer_url)),
         static_cast<blink::WebReferrerPolicy>(referrer_policy));
   }
 
   params.is_renderer_initiated = is_renderer_initiated;
 
   LoadUrl(params);
 }
 
-ScopedJavaLocalRef<jstring> ContentViewCoreImpl::GetURL(
-    JNIEnv* env, jobject) const {
-  return ConvertUTF8ToJavaString(env, GetWebContents()->GetURL().spec());
-}
-
-jboolean ContentViewCoreImpl::IsIncognito(JNIEnv* env, jobject obj) {
-  return GetWebContents()->GetBrowserContext()->IsOffTheRecord();
-}
-
 WebContents* ContentViewCoreImpl::GetWebContents() const {
   return web_contents_;
 }
 
 void ContentViewCoreImpl::SetFocus(JNIEnv* env, jobject obj, jboolean focused) {
   SetFocusInternal(focused);
 }
 
 void ContentViewCoreImpl::SetFocusInternal(bool focused) {
   if (!GetRenderWidgetHostViewAndroid())
@@ skipping 575 matching lines @@
       static_cast<int>(x / dpi_scale()),
       static_cast<int>(y / dpi_scale()),
       static_cast<int>((width > 0 && width < dpi_scale()) ?
           1 : (int)(width / dpi_scale())),
       static_cast<int>((height > 0 && height < dpi_scale()) ?
           1 : (int)(height / dpi_scale())));
   GetWebContents()->Send(new ViewMsg_ExtractSmartClipData(
       GetWebContents()->GetRoutingID(), rect));
 }
 
-void ContentViewCoreImpl::ResumeResponseDeferredAtStart(JNIEnv* env,
-                                                        jobject obj) {
-  static_cast<WebContentsImpl*>(GetWebContents())->
-      ResumeResponseDeferredAtStart();
-}
-
-void ContentViewCoreImpl::SetHasPendingNavigationTransitionForTesting(
-    JNIEnv* env,
-    jobject obj) {
-  RenderFrameHost* frame = static_cast<WebContentsImpl*>(GetWebContents())->
-      GetMainFrame();
-  BrowserThread::PostTask(
-      BrowserThread::IO,
-      FROM_HERE,
-      base::Bind(
-          &TransitionRequestManager::SetHasPendingTransitionRequest,
-          base::Unretained(TransitionRequestManager::GetInstance()),
-          frame->GetProcess()->GetID(),
-          frame->GetRoutingID(),
-          true));
-}
-
 jint ContentViewCoreImpl::GetCurrentRenderProcessId(JNIEnv* env, jobject obj) {
   return GetRenderProcessIdFromRenderViewHost(
       web_contents_->GetRenderViewHost());
 }
 
 void ContentViewCoreImpl::SetBackgroundOpaque(JNIEnv* env, jobject jobj,
     jboolean opaque) {
   if (GetRenderWidgetHostViewAndroid())
     GetRenderWidgetHostViewAndroid()->SetBackgroundOpaque(opaque);
 }
@@ skipping 41 matching lines @@
 
   std::vector<GURL>::const_iterator iter = entering_stylesheets.begin();
   for (; iter != entering_stylesheets.end(); ++iter) {
     ScopedJavaLocalRef<jstring> jstring_url(ConvertUTF8ToJavaString(
         env, iter->spec()));
     Java_ContentViewCore_addEnteringStylesheetToTransition(
         env, obj.obj(), jstring_url.obj());
   }
 }
 
 bool ContentViewCoreImpl::WillHandleDeferAfterResponseStarted() {

[Yaron, 2014/08/04 17:08:30]

I think we should probably move these two functions along with it. Effectively
moving the whole feature to WebContents (i.e. these are teh  calls that come
back from teh renderer). See https://codereview.chromium.org/297973002 which was
the original patch that added these. It would also mean that we can remove the
CVC dependency from web_contents_impl.cc.

[AKVT, 2014/08/05 13:58:43]

Thank you for reference patch link. I have modified the code based on this
patchset.

   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return false;
 
   return Java_ContentViewCore_willHandleDeferAfterResponseStarted(env,
                                                                   obj.obj());
 }
 
 void ContentViewCoreImpl::DidStartNavigationTransitionForFrame(int64 frame_id) {
@@ skipping 41 matching lines @@
       reinterpret_cast<ui::WindowAndroid*>(window_android),
       retained_objects_set);
   return reinterpret_cast<intptr_t>(view);
 }
 
 bool RegisterContentViewCore(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content