Remove ContentViewCore::RequestTextSurroundingSelection

chrome/browser/android/contextualsearch/contextual_search_delegate.cc

Index: chrome/browser/android/contextualsearch/contextual_search_delegate.cc
diff --git a/chrome/browser/android/contextualsearch/contextual_search_delegate.cc b/chrome/browser/android/contextualsearch/contextual_search_delegate.cc
index 7c1d27a3030bf79bcc8f5e5618463d8504d597e7..133e089c04bb5764b97f26a059a0c4a0c6822084 100644
--- a/chrome/browser/android/contextualsearch/contextual_search_delegate.cc
+++ b/chrome/browser/android/contextualsearch/contextual_search_delegate.cc
@@ -26,6 +26,7 @@
 #include "components/variations/net/variations_http_headers.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/web_contents.h"
 #include "net/base/escape.h"
 #include "net/http/http_status_code.h"
@@ -33,6 +34,8 @@
 #include "url/gurl.h"
 
 using content::ContentViewCore;
+using content::RenderFrameHost;
+using content::WebContents;
 
 namespace {
 
@@ -234,13 +237,24 @@ void ContextualSearchDelegate::GatherSurroundingTextWithCallback(
     content::ContentViewCore* content_view_core,
     bool may_send_base_page_url,
     HandleSurroundingsCallback callback) {
+  DCHECK(content_view_core && content_view_core->GetWebContents());
+  DCHECK(!callback.is_null());
+  DCHECK(!selection.empty());
+  RenderFrameHost* focused_frame =
+      content_view_core->GetWebContents()->GetFocusedFrame();
+  // If already one request is in progress, then return immediately with empty
+  // result.
+  if (!focused_frame || focused_frame->HasTextSurroundingSelectionCallback()) {

[no sievers, 2016/07/18 22:41:18]

Can you remove HasTextSurroundingSelectionCallback() from RenderFrameHost's
interface and just handle this internally there?

I think then RequestTextSurroundingSelection() is also a better name than saying
'Send...' (since that's an implementation detail that it sends a message).

[AKV, 2016/07/20 12:32:07]

Done.

+    callback.Run(base::string16(), 0, 0);
+    return;
+  }
   // Immediately cancel any request that's in flight, since we're building a new
   // context (and the response disposes of any existing context).
   search_term_fetcher_.reset();
   BuildContext(selection, use_resolved_search_term, content_view_core,
                may_send_base_page_url);
-  content_view_core->RequestTextSurroundingSelection(
-      field_trial_->GetSurroundingSize(), callback);
+  focused_frame->SendTextSurroundingSelectionRequest(
+      callback, field_trial_->GetSurroundingSize());
 }
 
 void ContextualSearchDelegate::BuildContext(