Let ui_test_utils::FindInPage optionally return the selection rect. This will be used in a future c…

chrome/browser/ui/find_bar/find_bar_host_browsertest.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 "base/message_loop.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 122 matching lines @@
 
   // Platform independent FindInPage that takes |const wchar_t*|
   // as an input.
   int FindInPageWchar(TabContents* tab,
                       const wchar_t* search_str,
                       bool forward,
                       bool case_sensitive,
                       int* ordinal) {
     return ui_test_utils::FindInPage(
         tab, WideToUTF16(std::wstring(search_str)),
-        forward, case_sensitive, ordinal);
+        forward, case_sensitive, ordinal, NULL);
   }
 
   // Calls FindInPageWchar till the find box's x position != |start_x_position|.
   // Return |start_x_position| if the find box has not moved after iterating
   // through all matches of |search_str|.
   int FindInPageTillBoxMoves(TabContents* tab,
                              int start_x_position,
                              const wchar_t* search_str,
                              int expected_matches) {
     // Search for |search_str| which the Find box is obscuring.
@@ skipping 650 matching lines @@
                                kFwd, kIgnoreCase, &ordinal));
   EXPECT_EQ(0, ordinal);
 
   // Open another tab (tab B).
   chrome::NewTab(browser());
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Simulate what happens when you press F3 for FindNext. We should get a
   // response here (a hang means search was aborted).
   EXPECT_EQ(0, ui_test_utils::FindInPage(tab, string16(),
-                                         kFwd, kIgnoreCase, &ordinal));
+                                         kFwd, kIgnoreCase, &ordinal, NULL));
   EXPECT_EQ(0, ordinal);
 
   // Open another tab (tab C).
   chrome::NewTab(browser());
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Simulate what happens when you press F3 for FindNext. We should get a
   // response here (a hang means search was aborted).
   EXPECT_EQ(0, ui_test_utils::FindInPage(tab, string16(),
-                                         kFwd, kIgnoreCase, &ordinal));
+                                         kFwd, kIgnoreCase, &ordinal, NULL));
   EXPECT_EQ(0, ordinal);
 }
 
 #if defined(TOOLKIT_VIEWS)
 // Make sure Find box grabs the Esc accelerator and restores it again.
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, AcceleratorRestoring) {
   // First we navigate to any page.
   GURL url = GetURL(kSimple);
   ui_test_utils::NavigateToURL(browser(), url);
 
@@ skipping 66 matching lines @@
 
   // Search for 'page'. Should have 1 match.
   int ordinal = 0;
   TabContents* tab = chrome::GetActiveTabContents(browser());
   EXPECT_EQ(1, FindInPageWchar(tab, L"page", kFwd, kIgnoreCase, &ordinal));
   EXPECT_EQ(1, ordinal);
 
   // Simulate what happens when you press F3 for FindNext. Still should show
   // one match. This cleared the pre-populate string at one point (see bug).
   EXPECT_EQ(1, ui_test_utils::FindInPage(tab, string16(),
-                                         kFwd, kIgnoreCase, &ordinal));
+                                         kFwd, kIgnoreCase, &ordinal, NULL));
   EXPECT_EQ(1, ordinal);
 
   // End the Find session, thereby making the next F3 start afresh.
   browser()->GetFindBarController()->EndFindSession(
       FindBarController::kKeepSelectionOnPage,
       FindBarController::kKeepResultsInFindBox);
 
   // Simulate F3 while Find box is closed. Should have 1 match.
   EXPECT_EQ(1, FindInPageWchar(tab, L"", kFwd, kIgnoreCase, &ordinal));
   EXPECT_EQ(1, ordinal);
@@ skipping 23 matching lines @@
 
   // Find "given".
   FindInPageWchar(tab2, L"given", kFwd, kIgnoreCase, &ordinal);
 
   // Switch back to first tab.
   chrome::ActivateTabAt(browser(), 0, false);
   browser()->GetFindBarController()->EndFindSession(
       FindBarController::kKeepSelectionOnPage,
       FindBarController::kKeepResultsInFindBox);
   // Simulate F3.
-  ui_test_utils::FindInPage(tab1, string16(), kFwd, kIgnoreCase, &ordinal);
+  ui_test_utils::FindInPage(tab1, string16(), kFwd, kIgnoreCase, &ordinal,
+                            NULL);
   EXPECT_EQ(tab1->find_tab_helper()->find_text(), WideToUTF16(L"text"));
 }
 
 // This tests that whenever you close and reopen the Find bar, it should show
 // the last search entered in that tab. http://crbug.com/40121.
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, PrepopulateSameTab) {
 #if defined(OS_MACOSX)
   // FindInPage on Mac doesn't use prepopulated values. Search there is global.
   return;
 #endif
@@ skipping 286 matching lines @@
   content::RunAllPendingInMessageLoop();  // Needed on Linux.
   EXPECT_TRUE(GetFindBarWindowInfo(&position, NULL));
 
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), url, NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   chrome::CloseTab(browser());
   EXPECT_TRUE(GetFindBarWindowInfo(&position2, NULL));
   EXPECT_EQ(position, position2);
 }