Changes to how FindRequestManager reports find results.

content/browser/find_request_manager.h

 // Copyright 2016 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.
 
 #ifndef CONTENT_BROWSER_FIND_REQUEST_MANAGER_H_
 #define CONTENT_BROWSER_FIND_REQUEST_MANAGER_H_
 
 #include <queue>
 #include <unordered_map>
 #include <unordered_set>
@@ skipping 234 matching lines @@
   // The request ID of the initial find request in the current find-in-page
   // session, which uniquely identifies this session. Request IDs are included
   // in all find-related IPCs, which allows reply IPCs containing results from
   // previous sessions (with |request_id| < |current_session_id_|) to be easily
   // identified and ignored.
   int current_session_id_;
 
   // The current find request.
   FindRequest current_request_;
 
-  // The set of frames that are still expected to reply to a pending find
-  // request. Frames are removed from |pending_replies_| when their reply with
-  // |final_update| set to true is received.
-  std::unordered_set<RenderFrameHost*> pending_replies_;
+  // The set of frames that are still expected to reply to a pending initial
+  // find request. Frames are removed from |pending_initial_replies_| when their
+  // reply to the initial find request is received with |final_update| set to
+  // true.
+  std::unordered_set<RenderFrameHost*> pending_initial_replies_;
+
+  // The frame (if any) that is still expected to reply to the last pending
+  // "find next" request.
+  RenderFrameHost* pending_find_next_reply_;
 
   // Indicates whether an update to the active match ordinal is expected. Once
   // set, |pending_active_match_ordinal_| will not reset until an update to the
   // active match ordinal is received in response to the find request with ID
   // |current_request_.id| (the latest request).
   bool pending_active_match_ordinal_;
 
   // The number of matches found in each frame. There will necessarily be
   // entries in this map for every frame that is being (or has been) searched in
   // the current find session, and no other frames.
@@ skipping 17 matching lines @@
   gfx::Rect selection_rect_;
 
   // Find requests are queued here when previous requests need to be handled
   // before these ones can be properly routed.
   std::queue<FindRequest> find_request_queue_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FIND_REQUEST_MANAGER_H_