Android: Remove ContentViewCore::GetLayer() from public interface

chrome/browser/android/contextualsearch/contextual_search_manager.cc

 // Copyright 2015 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 "chrome/browser/android/contextualsearch/contextual_search_manager.h"
 
 #include <set>
 
 #include "base/android/jni_string.h"
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "chrome/browser/android/contextualsearch/contextual_search_delegate.h"
 #include "chrome/browser/android/contextualsearch/resolved_search_term.h"
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "components/contextual_search/browser/contextual_search_js_api_service_impl.h"
 #include "components/contextual_search/common/overlay_page_notifier_service.mojom.h"
 #include "components/navigation_interception/intercept_navigation_delegate.h"
 #include "components/variations/variations_associated_data.h"
-#include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
+#include "content/public/browser/web_contents.h"
 #include "jni/ContextualSearchManager_jni.h"
 #include "net/url_request/url_fetcher_impl.h"
 #include "services/shell/public/cpp/interface_provider.h"
 #include "services/shell/public/cpp/interface_registry.h"
 
-using content::ContentViewCore;
+using content::WebContents;
 
 // This class manages the native behavior of the Contextual Search feature.
 // Instances of this class are owned by the Java ContextualSearchManager.
 // Most of the work is actually done in an associated delegate to this class:
 // the ContextualSearchDelegate.
 ContextualSearchManager::ContextualSearchManager(JNIEnv* env, jobject obj) {
   java_manager_.Reset(env, obj);
   Java_ContextualSearchManager_setNativeManager(
       env, obj, reinterpret_cast<intptr_t>(this));
   Profile* profile = ProfileManager::GetActiveUserProfile();
@@ skipping 16 matching lines @@
 void ContextualSearchManager::Destroy(JNIEnv* env,
                                       const JavaParamRef<jobject>& obj) {
   delete this;
 }
 
 void ContextualSearchManager::StartSearchTermResolutionRequest(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jstring>& j_selection,
     jboolean j_use_resolved_search_term,
-    const JavaParamRef<jobject>& j_base_content_view_core,
+    const JavaParamRef<jobject>& j_base_web_contents,
     jboolean j_may_send_base_page_url) {
-  ContentViewCore* base_content_view_core =
-      ContentViewCore::GetNativeContentViewCore(env, j_base_content_view_core);
-  DCHECK(base_content_view_core);
+  WebContents* base_web_contents =
+      WebContents::FromJavaWebContents(j_base_web_contents.obj());
+  DCHECK(base_web_contents);
   std::string selection(
       base::android::ConvertJavaStringToUTF8(env, j_selection));
   bool use_resolved_search_term = j_use_resolved_search_term;
   bool may_send_base_page_url = j_may_send_base_page_url;
   // Calls back to OnSearchTermResolutionResponse.
   delegate_->StartSearchTermResolutionRequest(
-      selection, use_resolved_search_term, base_content_view_core,
+      selection, use_resolved_search_term, base_web_contents,
       may_send_base_page_url);
 }
 
 void ContextualSearchManager::GatherSurroundingText(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jstring>& j_selection,
     jboolean j_use_resolved_search_term,
-    const JavaParamRef<jobject>& j_base_content_view_core,
+    const JavaParamRef<jobject>& j_base_web_contents,
     jboolean j_may_send_base_page_url) {
-  ContentViewCore* base_content_view_core =
-      ContentViewCore::GetNativeContentViewCore(env, j_base_content_view_core);
-  DCHECK(base_content_view_core);
+  WebContents* base_web_contents =
+      WebContents::FromJavaWebContents(j_base_web_contents.obj());
+  DCHECK(base_web_contents);
   std::string selection(
       base::android::ConvertJavaStringToUTF8(env, j_selection));
   bool use_resolved_search_term = j_use_resolved_search_term;
   bool may_send_base_page_url = j_may_send_base_page_url;
   delegate_->GatherAndSaveSurroundingText(selection, use_resolved_search_term,
-                                          base_content_view_core,
+                                          base_web_contents,
                                           may_send_base_page_url);
 }
 
 base::android::ScopedJavaLocalRef<jstring>
 ContextualSearchManager::GetTargetLanguage(JNIEnv* env,
                                            const JavaParamRef<jobject>& obj) {
   DCHECK(delegate_);
   std::string target_language(delegate_->GetTargetLanguage());
   base::android::ScopedJavaLocalRef<jstring> j_target_language =
       base::android::ConvertUTF8ToJavaString(env, target_language.c_str());
@@ skipping 56 matching lines @@
   base::android::ScopedJavaLocalRef<jstring> j_surrounding_text =
       base::android::ConvertUTF16ToJavaString(env, surrounding_text.c_str());
   Java_ContextualSearchManager_onIcingSelectionAvailable(
       env, java_manager_.obj(), j_encoding.obj(), j_surrounding_text.obj(),
       start_offset, end_offset);
 }
 
 void ContextualSearchManager::EnableContextualSearchJsApiForOverlay(
     JNIEnv* env,
     jobject obj,
-    jobject j_overlay_content_view_core) {
-  ContentViewCore* overlay_content_view_core =
-      ContentViewCore::GetNativeContentViewCore(env,
-                                                j_overlay_content_view_core);
+    const JavaParamRef<jobject>& j_overlay_web_contents) {
+  WebContents* overlay_web_contents =
+      WebContents::FromJavaWebContents(j_overlay_web_contents.obj());
+  DCHECK(overlay_web_contents);
   // Tell our Overlay Notifier Service that this is currently a CS page.
   content::RenderFrameHost* render_frame_host =
-      overlay_content_view_core->GetWebContents()
-          ->GetRenderViewHost()
-          ->GetMainFrame();
+      overlay_web_contents->GetRenderViewHost()->GetMainFrame();
   DCHECK(render_frame_host);
   contextual_search::mojom::OverlayPageNotifierServicePtr page_notifier_service;
   render_frame_host->GetRemoteInterfaces()->GetInterface(
       &page_notifier_service);
   DCHECK(page_notifier_service);
   page_notifier_service->NotifyIsContextualSearchOverlay();
 
   // Also set up the backchannel to call into this class from the JS API.
   render_frame_host->GetInterfaceRegistry()->AddInterface(
       base::Bind(&contextual_search::CreateContextualSearchJsApiService, this));
 }
 
 bool RegisterContextualSearchManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   ContextualSearchManager* manager = new ContextualSearchManager(env, obj);
   return reinterpret_cast<intptr_t>(manager);
 }
 
 void ContextualSearchManager::SetCaption(std::string caption,
                                          bool does_answer) {
   JNIEnv* env = base::android::AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jstring> j_caption =
       base::android::ConvertUTF8ToJavaString(env, caption.c_str());
   Java_ContextualSearchManager_onSetCaption(env, java_manager_.obj(),
                                             j_caption.obj(), does_answer);
 }