Implement a shell of FindRequestManager, and hook it up to WebContentsImpl.

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 21 matching lines @@
 void FindHelper::SetListener(Listener* listener) {
   listener_ = listener;
 }
 
 void FindHelper::FindAllAsync(const base::string16& search_string) {
   // Stop any ongoing asynchronous request.
   web_contents()->StopFinding(content::STOP_FIND_ACTION_KEEP_SELECTION);
 
   async_find_started_ = true;
 
-  StartNewRequest(search_string);
+  StartNewSession(search_string);
 
   if (MaybeHandleEmptySearch(search_string))
     return;
 
   WebFindOptions options;
   options.forward = true;
   options.matchCase = false;
   options.findNext = false;
 
   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_ || request_id != current_request_id_)
     return;
 
   NotifyResults(active_ordinal, match_count, finished);
 }
 
 void FindHelper::FindNext(bool forward) {
   if (!async_find_started_)
     return;
 
+  current_request_id_ = find_request_id_counter_++;
+
   if (MaybeHandleEmptySearch(last_search_string_))
     return;
 
   WebFindOptions options;
   options.forward = forward;
   options.matchCase = false;
   options.findNext = true;
 
   web_contents()->Find(current_request_id_, last_search_string_, options);
 }
 
 void FindHelper::ClearMatches() {
   web_contents()->StopFinding(content::STOP_FIND_ACTION_CLEAR_SELECTION);
 
   async_find_started_ = false;
   last_search_string_.clear();
   last_match_count_ = -1;
   last_active_ordinal_ = -1;
 }
 
 bool FindHelper::MaybeHandleEmptySearch(const base::string16& search_string) {
   if (!search_string.empty())
     return false;
 
   web_contents()->StopFinding(content::STOP_FIND_ACTION_CLEAR_SELECTION);
   NotifyResults(0, 0, true);
   return true;
 }
 
-void FindHelper::StartNewRequest(const base::string16& search_string) {
+void FindHelper::StartNewSession(const base::string16& search_string) {
   current_request_id_ = find_request_id_counter_++;
   last_search_string_ = search_string;
   last_match_count_ = -1;
   last_active_ordinal_ = -1;
 }
 
 void FindHelper::NotifyResults(int active_ordinal,
                                int match_count,
                                bool finished) {
   // Match count or ordinal values set to -1 refer to received replies.
@@ skipping 25 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