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

chrome/browser/android/contextualsearch/contextual_search_delegate.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_DELEGATE_H_
 #define CHROME_BROWSER_ANDROID_CONTEXTUALSEARCH_CONTEXTUAL_SEARCH_DELEGATE_H_
 
 #include <stddef.h>
 
 #include <memory>
 
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/android/contextualsearch/contextual_search_context.h"
 #include "chrome/browser/android/contextualsearch/resolved_search_term.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
+namespace content {
+class WebContents;
+}
+
 namespace net {
 class URLRequestContextGetter;
 }  // namespace net
 
 class Profile;
 class TemplateURLService;
 class ContextualSearchFieldTrial;
 
 // Handles tasks for the ContextualSearchManager in a separable and testable
 // way, without the complication of being connected to a Java object.
@@ skipping 29 matching lines @@
       const IcingCallback& icing_callback);
   ~ContextualSearchDelegate() override;
 
   // Gathers surrounding text and starts an asynchronous search term resolution
   // request. The "search term" is the best query to issue for a section of text
   // in the context of a web page. When the response is available the callback
   // specified in the constructor is run.
   void StartSearchTermResolutionRequest(
       const std::string& selection,
       bool use_resolved_search_term,
-      content::ContentViewCore* content_view_core,
+      content::WebContents* web_contents,
       bool may_send_base_page_url);
 
   // Gathers surrounding text and saves it locally for a future query.
   void GatherAndSaveSurroundingText(const std::string& selection,
                                     bool use_resolved_search_term,
-                                    content::ContentViewCore* content_view_core,
+                                    content::WebContents* web_contents,
                                     bool may_send_base_page_url);
 
   // Continues making a Search Term Resolution request, once the surrounding
   // text has been gathered.
   void ContinueSearchTermResolutionRequest();
 
   // Gets the target language for translation purposes for this user.
   std::string GetTargetLanguage();
 
   // Returns the accept languages preference string.
@@ skipping 23 matching lines @@
                            DecodeSearchTermFromJsonResponse);
   FRIEND_TEST_ALL_PREFIXES(ContextualSearchDelegateTest, DecodeStringMentions);
 
   // net::URLFetcherDelegate:
   void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   // Builds the ContextualSearchContext in the current context from
   // the given parameters.
   void BuildContext(const std::string& selection,
                     bool use_resolved_search_term,
-                    content::ContentViewCore* content_view_core,
+                    content::WebContents* web_contents,
                     bool may_send_base_page_url);
 
   // Builds and returns the search term resolution request URL.
   // |selection| is used as the default query.
   std::string BuildRequestUrl(std::string selection);
 
   // Uses the TemplateURL service to construct a search term resolution URL from
   // the given parameters.
   std::string GetSearchTermResolutionUrlString(
       const std::string& selected_text,
       const std::string& base_page_url,
       const bool may_send_base_page_url);
 
   // Will gather the surrounding text from the |content_view_core| and call the
   // |callback|.
   void GatherSurroundingTextWithCallback(
       const std::string& selection,
       bool use_resolved_search_term,
-      content::ContentViewCore* content_view_core,
+      content::WebContents* web_contents,
       bool may_send_base_page_url,
       HandleSurroundingsCallback callback);
 
   // Callback for GatherSurroundingTextWithCallback(). Will start the search
   // term resolution request.
   void StartSearchTermRequestFromSelection(
       const base::string16& surrounding_text,
       int start_offset,
       int end_offset);
 
@@ skipping 82 matching lines @@
   // The callback for notifications of Icing selection being available.
   IcingCallback icing_callback_;
 
   // Used to hold the context until an upcoming search term request is started.
   std::unique_ptr<ContextualSearchContext> context_;
 
   DISALLOW_COPY_AND_ASSIGN(ContextualSearchDelegate);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_CONTEXTUALSEARCH_CONTEXTUAL_SEARCH_DELEGATE_H_