Fix issue 5079: Incorrect "Active match ordinal" count during Find-in-page...

chrome/test/automation/tab_proxy.cc

 // Copyright (c) 2006-2008 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/test/automation/tab_proxy.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "chrome/common/json_value_serializer.h"
@@ skipping 103 matching lines @@
   void* iter = NULL;
   response->ReadInt(&iter, x);
   response->ReadInt(&iter, y);
   delete response;
   return true;
 }
 
 int TabProxy::FindInPage(const std::wstring& search_string,
                          FindInPageDirection forward,
                          FindInPageCase match_case,
-                         bool find_next) {
+                         bool find_next,
+                         int* active_ordinal) {
   if (!is_valid())
     return -1;
 
   FindInPageRequest request = {0};
   request.search_string = search_string;
   request.find_next = find_next;
   // The explicit comparison to TRUE avoids a warning (C4800).
   request.match_case = match_case == TRUE;
   request.forward = forward == TRUE;
 
   IPC::Message* response = NULL;
   bool succeeded = sender_->SendAndWaitForResponse(
       new AutomationMsg_FindRequest(0, handle_, request),
       &response,
-      AutomationMsg_FindInPageResponse::ID);
+      AutomationMsg_FindInPageResponse2::ID);
   if (!succeeded)
     return -1;
 
   void* iter = NULL;
+  int ordinal;
   int matches_found;
-  AutomationMsg_FindInPageResponse::Read(response, &matches_found);
-
+  response->ReadInt(&iter, &ordinal);
+  response->ReadInt(&iter, &matches_found);
+  if (active_ordinal)
+    *active_ordinal = ordinal;
+  delete response;
   return matches_found;
 }
 
 int TabProxy::NavigateToURL(const GURL& url) {
   return NavigateToURLWithTimeout(url, INFINITE, NULL);
 }
 
 int TabProxy::NavigateToURLWithTimeout(const GURL& url,
                                        uint32 timeout_ms,
                                        bool* is_timeout) {
@@ skipping 878 matching lines @@
       &response,
       AutomationMsg_WaitForNavigationResponse::ID);
   scoped_ptr<IPC::Message> auto_deleter(response);
   if (!success)
     return false;
 
   void* iter = NULL;
   response->ReadBool(&iter, &success);
   return success;
 }