Move Find Operations from RenderViewHost to WebContents

android_webview/browser/find_helper.cc

 // Copyright (c) 2012 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 "android_webview/browser/find_helper.h"
 
 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
 #include "base/message_loop/message_loop.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 19 matching lines @@
 
 FindHelper::~FindHelper() {
 }
 
 void FindHelper::SetListener(Listener* listener) {
   listener_ = listener;
 }
 
 void FindHelper::FindAllAsync(const base::string16& search_string) {
   // Stop any ongoing asynchronous request.
-  web_contents()->GetRenderViewHost()->StopFinding(
-      content::STOP_FIND_ACTION_KEEP_SELECTION);
+  web_contents()->StopFinding(content::STOP_FIND_ACTION_KEEP_SELECTION);
 
   sync_find_started_ = false;
   async_find_started_ = true;
 
   WebFindOptions options;
   options.forward = true;
   options.matchCase = false;
   options.findNext = false;
 
   StartNewRequest(search_string);
-  web_contents()->GetRenderViewHost()->Find(current_request_id_,
-                                            search_string, options);
+  web_contents()->Find(current_request_id_, search_string, options);
 }
 
 void FindHelper::HandleFindReply(int request_id,
                                    int match_count,
                                    int active_ordinal,
                                    bool finished) {
   if ((!async_find_started_ && !sync_find_started_) ||
       request_id != current_request_id_) {
     return;
   }
 
   NotifyResults(active_ordinal, match_count, finished);
 }
 
 void FindHelper::FindNext(bool forward) {
   if (!sync_find_started_ && !async_find_started_)
     return;
 
   WebFindOptions options;
   options.forward = forward;
   options.matchCase = false;
   options.findNext = true;
 
-  web_contents()->GetRenderViewHost()->Find(current_request_id_,
-                                            last_search_string_,
-                                            options);
+  web_contents()->Find(current_request_id_, last_search_string_, options);
 }
 
 void FindHelper::ClearMatches() {
-  web_contents()->GetRenderViewHost()->StopFinding(
-      content::STOP_FIND_ACTION_CLEAR_SELECTION);
+  web_contents()->StopFinding(content::STOP_FIND_ACTION_CLEAR_SELECTION);
 
   sync_find_started_ = false;
   async_find_started_ = false;
   last_search_string_.clear();
   last_match_count_ = -1;
   last_active_ordinal_ = -1;
 }
 
 void FindHelper::StartNewRequest(const base::string16& search_string) {
   current_request_id_ = find_request_id_counter_++;
@@ skipping 34 matching lines @@
 
   // WebView.FindListener active match ordinals are 0-based while WebKit sends
   // 1-based ordinals. Still we can receive 0 ordinal in case of no results.
   active_ordinal = std::max(active_ordinal - 1, 0);
 
   if (listener_)
     listener_->OnFindResultReceived(active_ordinal, match_count, finished);
 }
 
 }  // namespace android_webview