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..34f62cf5003197e5a54b3c564dd337801153f796 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,7 @@
 #include "url/gurl.h"
 
 using content::ContentViewCore;
+using content::RenderFrameHost;
 
 namespace {
 
@@ -234,13 +236,22 @@ void ContextualSearchDelegate::GatherSurroundingTextWithCallback(
     content::ContentViewCore* content_view_core,
     bool may_send_base_page_url,
     HandleSurroundingsCallback callback) {
+  DCHECK(content_view_core && content_view_core->GetWebContents());

[Ted C, 2016/07/20 22:23:29]

this seems unneeded to me.  we weren't null checking cvc before

also, combining these into a single dcheck makes it hard to see what was
failing...was the cvc null or web contents?  I'm in favor of removing it all
together, but if not, please split into two.

[AKV, 2016/07/21 09:13:52]

Done.

+  DCHECK(!callback.is_null());
+  DCHECK(!selection.empty());
+  RenderFrameHost* focused_frame =
+      content_view_core->GetWebContents()->GetFocusedFrame();
+  if (!focused_frame) {
+    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->RequestTextSurroundingSelection(
+      callback, field_trial_->GetSurroundingSize());
 }
 
 void ContextualSearchDelegate::BuildContext(