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

chrome/browser/android/contextualsearch/contextual_search_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_ANDROID_CONTEXTUALSEARCH_CONTEXTUAL_SEARCH_MANAGER_H_
 #define CHROME_BROWSER_ANDROID_CONTEXTUALSEARCH_CONTEXTUAL_SEARCH_MANAGER_H_
 
 #include <stddef.h>
 
 #include "base/android/jni_android.h"
@@ skipping 21 matching lines @@
   // content view core object).
   // Any outstanding server requests are canceled.
   // When the server responds with the search term, the Java object is notified
   // by
   // calling OnSearchTermResolutionResponse().
   void StartSearchTermResolutionRequest(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj,
       const base::android::JavaParamRef<jstring>& j_selection,
       jboolean j_use_resolved_search_term,
-      const base::android::JavaParamRef<jobject>& j_base_content_view_core,
+      const base::android::JavaParamRef<jobject>& j_base_web_contents,
       jboolean j_may_send_base_page_url);
 
   // Gathers the surrounding text around the selection and saves it locally.
   // Does not send a search term resolution request to the server.
   void GatherSurroundingText(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj,
       const base::android::JavaParamRef<jstring>& j_selection,
       jboolean j_use_resolved_search_term,
-      const base::android::JavaParamRef<jobject>& j_base_content_view_core,
+      const base::android::JavaParamRef<jobject>& j_base_web_contents,
       jboolean j_may_send_base_page_url);
 
   // Gets the target language for translation purposes.
   base::android::ScopedJavaLocalRef<jstring> GetTargetLanguage(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj);
 
   // Gets the accept-languages preference string.
   base::android::ScopedJavaLocalRef<jstring> GetAcceptLanguages(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj);
 
-  // Enables the Contextual Search JS API for the given |ContentViewCore|.
+  // Enables the Contextual Search JS API for the given |WebContents|.
   void EnableContextualSearchJsApiForOverlay(
       JNIEnv* env,
       jobject obj,
-      jobject j_overlay_content_view_core);
+      const base::android::JavaParamRef<jobject>& j_web_contents);
 
   // ContextualSearchJsApiHandler overrides:
   void SetCaption(std::string caption, bool does_answer) override;
 
  private:
   void OnSearchTermResolutionResponse(
       const ResolvedSearchTerm& resolved_search_term);
 
   // Calls back to Java with the surrounding text to be displayed.
   void OnSurroundingTextAvailable(const std::string& after_text);
 
   // Calls back to Java with notification for Icing selection.
   void OnIcingSelectionAvailable(const std::string& encoding,
                                  const base::string16& surrounding_text,
                                  size_t start_offset,
                                  size_t end_offset);
 
   // Our global reference to the Java ContextualSearchManager.
   base::android::ScopedJavaGlobalRef<jobject> java_manager_;
 
   // The delegate we're using the do the real work.
   std::unique_ptr<ContextualSearchDelegate> delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(ContextualSearchManager);
 };
 
 bool RegisterContextualSearchManager(JNIEnv* env);
 
 #endif  // CHROME_BROWSER_ANDROID_CONTEXTUALSEARCH_CONTEXTUAL_SEARCH_MANAGER_H_