Fix for problem with activating find-in-page match via find tickbar.

chrome/browser/ui/find_bar/find_tab_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 "chrome/browser/ui/find_bar/find_tab_helper.h"
 
 #include <vector>
 
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
@@ skipping 15 matching lines @@
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(FindTabHelper);
 
 // static
 int FindTabHelper::find_request_id_counter_ = -1;
 
 FindTabHelper::FindTabHelper(WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       find_ui_active_(false),
       find_op_aborted_(false),
       current_find_request_id_(find_request_id_counter_++),
+      current_find_session_id_(current_find_request_id_),
       last_search_case_sensitive_(false),
       last_search_result_() {
 }
 
 FindTabHelper::~FindTabHelper() {
 }
 
 void FindTabHelper::StartFinding(base::string16 search_string,
                                  bool forward_direction,
                                  bool case_sensitive) {
@@ skipping 26 matching lines @@
   // or if the passed in search text is empty (FindNext keyboard shortcut). The
   // exception to this is if the Find was aborted (then we don't want FindNext
   // because the highlighting has been cleared and we need it to reappear). We
   // therefore treat FindNext after an aborted Find operation as a full fledged
   // Find.
   bool find_next = (find_text_ == search_string || search_string.empty()) &&
                    (last_search_case_sensitive_ == case_sensitive) &&
                    !find_op_aborted_;
 
   current_find_request_id_ = find_request_id_counter_++;
+  if (!find_next)
+    current_find_session_id_ = current_find_request_id_;
 
   if (!search_string.empty())
     find_text_ = search_string;
   last_search_case_sensitive_ = case_sensitive;
 
   find_op_aborted_ = false;
 
   // Keep track of what the last search was across the tabs.
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
@@ skipping 57 matching lines @@
   if (!find_op_aborted_ && !find_text_.empty())
     web_contents()->RequestFindMatchRects(current_version);
 }
 #endif
 
 void FindTabHelper::HandleFindReply(int request_id,
                                     int number_of_matches,
                                     const gfx::Rect& selection_rect,
                                     int active_match_ordinal,
                                     bool final_update) {
-  // Ignore responses for requests that have been aborted.
-  // Ignore responses for requests other than the one we have most recently
-  // issued. That way we won't act on stale results when the user has
-  // already typed in another query.
-  if (!find_op_aborted_ && request_id == current_find_request_id_) {
+  // Ignore responses for requests that have been aborted.  Ignore responses for
+  // requests from previous sessiona. That way we won't act on stale results

[ncarter (slow), 2016/04/25 18:02:38]

"sessiona"

+  // when the user has already typed in another query.
+  if (!find_op_aborted_ && request_id >= current_find_session_id_) {
     if (number_of_matches == -1)
       number_of_matches = last_search_result_.number_of_matches();
     if (active_match_ordinal == -1)
       active_match_ordinal = last_search_result_.active_match_ordinal();
 
     gfx::Rect selection = selection_rect;
     if (final_update && active_match_ordinal == 0)
       selection = gfx::Rect();
     else if (selection_rect.IsEmpty())
       selection = last_search_result_.selection_rect();
 
     // Notify the UI, automation and any other observers that a find result was
     // found.
     last_search_result_ = FindNotificationDetails(
         request_id, number_of_matches, selection, active_match_ordinal,
         final_update);
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_FIND_RESULT_AVAILABLE,
         content::Source<WebContents>(web_contents()),
         content::Details<FindNotificationDetails>(&last_search_result_));
   }
 }