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 807 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,
+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);
@@ skipping 55 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 582 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) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnableExperimentalWebPlatformFeatures);
-  RenderFrameHost* frame = static_cast<WebContentsImpl*>(GetWebContents())->
-      GetMainFrame();
-  BrowserThread::PostTask(
-      BrowserThread::IO,
-      FROM_HERE,
-      base::Bind(
-          &TransitionRequestManager::AddPendingTransitionRequestData,
-          base::Unretained(TransitionRequestManager::GetInstance()),
-          frame->GetProcess()->GetID(),
-          frame->GetRoutingID(),
-          "*", "", ""));
-}
-
 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);
 }
 
-void ContentViewCoreImpl::SetupTransitionView(
-    JNIEnv* env, jobject jobj, jstring markup) {
-  if (!GetWebContents()) return;
-  GetWebContents()->GetMainFrame()->Send(new FrameMsg_SetupTransitionView(
-      GetWebContents()->GetMainFrame()->GetRoutingID(),
-      ConvertJavaStringToUTF8(env, markup)));
-}
-
-void ContentViewCoreImpl::BeginExitTransition(
-    JNIEnv* env, jobject jobj, jstring css_selector) {
-  if (!GetWebContents()) return;
-  GetWebContents()->GetMainFrame()->Send(new FrameMsg_BeginExitTransition(
-      GetWebContents()->GetMainFrame()->GetRoutingID(),
-      ConvertJavaStringToUTF8(env, css_selector)));
-}
-
 void ContentViewCoreImpl::RequestTextSurroundingSelection(
     int max_length,
     const base::Callback<
         void(const base::string16& content, int start_offset, int end_offset)>&
         callback) {
   DCHECK(!callback.is_null());
   RenderFrameHost* focused_frame = web_contents_->GetFocusedFrame();
   if (!focused_frame)
     return;
   if (GetRenderWidgetHostViewAndroid()) {
     GetRenderWidgetHostViewAndroid()->SetTextSurroundingSelectionCallback(
         callback);
     focused_frame->Send(new FrameMsg_TextSurroundingSelectionRequest(
         focused_frame->GetRoutingID(), max_length));
   }
 }
 
-void ContentViewCoreImpl::DidDeferAfterResponseStarted(
-    const TransitionLayerData& transition_data) {
-  JNIEnv* env = AttachCurrentThread();
-  ScopedJavaLocalRef<jobject> obj(java_ref_.get(env));
-  if (obj.is_null())
-    return;
-
-  std::vector<GURL> entering_stylesheets;
-  std::string transition_color;
-  if (transition_data.response_headers) {
-    TransitionRequestManager::ParseTransitionStylesheetsFromHeaders(
-        transition_data.response_headers, entering_stylesheets,
-        transition_data.request_url);
-
-    transition_data.response_headers->EnumerateHeader(
-        NULL, "X-Transition-Entering-Color", &transition_color);
-  }
-
-  ScopedJavaLocalRef<jstring> jstring_markup(ConvertUTF8ToJavaString(
-      env, transition_data.markup));
-
-  ScopedJavaLocalRef<jstring> jstring_css_selector(ConvertUTF8ToJavaString(
-      env, transition_data.css_selector));
-
-  ScopedJavaLocalRef<jstring> jstring_transition_color(ConvertUTF8ToJavaString(
-      env, transition_color));
-
-  Java_ContentViewCore_didDeferAfterResponseStarted(
-      env, obj.obj(), jstring_markup.obj(), jstring_css_selector.obj(),
-      jstring_transition_color.obj());
-
-  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() {
-  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) {
-  JNIEnv* env = AttachCurrentThread();
-  ScopedJavaLocalRef<jobject> obj(java_ref_.get(env));
-  if (obj.is_null())
-    return;
-  Java_ContentViewCore_didStartNavigationTransitionForFrame(
-      env, obj.obj(), frame_id);
-}
-
 void ContentViewCoreImpl::OnSmartClipDataExtracted(
     const base::string16& text,
     const base::string16& html,
     const gfx::Rect& clip_rect) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return;
   ScopedJavaLocalRef<jstring> jtext = ConvertUTF16ToJavaString(env, text);
   ScopedJavaLocalRef<jstring> jhtml = ConvertUTF16ToJavaString(env, html);
@@ skipping 23 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