Remove ContentViewCore::RequestTextSurroundingSelection

chrome/browser/android/contextualsearch/contextual_search_delegate.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_delegate.h"
 
 #include <algorithm>
 
 #include "base/base64.h"
 #include "base/command_line.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/android/contextualsearch/contextual_search_field_trial.h"
 #include "chrome/browser/android/contextualsearch/resolved_search_term.h"
 #include "chrome/browser/android/proto/client_discourse_context.pb.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/translate/translate_service.h"
 #include "chrome/common/pref_names.h"
 #include "components/browser_sync/browser/profile_sync_service.h"
 #include "components/prefs/pref_service.h"
 #include "components/search_engines/template_url_service.h"
 #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"
 #include "net/url_request/url_fetcher.h"
 #include "url/gurl.h"
 
 using content::ContentViewCore;
+using content::RenderFrameHost;
 
 namespace {
 
 const char kContextualSearchResponseDisplayTextParam[] = "display_text";
 const char kContextualSearchResponseSelectedTextParam[] = "selected_text";
 const char kContextualSearchResponseSearchTermParam[] = "search_term";
 const char kContextualSearchResponseLanguageParam[] = "lang";
 const char kContextualSearchResponseResolvedTermParam[] = "resolved_term";
 const char kContextualSearchPreventPreload[] = "prevent_preload";
 const char kContextualSearchMentions[] = "mentions";
@@ skipping 181 matching lines @@
   }
   return request;
 }
 
 void ContextualSearchDelegate::GatherSurroundingTextWithCallback(
     const std::string& selection,
     bool use_resolved_search_term,
     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(
     const std::string& selection,
     bool use_resolved_search_term,
     content::ContentViewCore* content_view_core,
     bool may_send_base_page_url) {
   // Decide if the URL should be sent with the context.
   GURL page_url(content_view_core->GetWebContents()->GetURL());
   GURL url_to_send;
@@ skipping 252 matching lines @@
     end_offset -= trim;
   }
   if (result_text.length() > end_offset + padding_each_side_pinned) {
     // Trim the end.
     result_text = result_text.substr(0, end_offset + padding_each_side_pinned);
   }
   *start = start_offset;
   *end = end_offset;
   return result_text;
 }