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

chrome/browser/ui/views/find_bar_host_interactive_uitest.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/process_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
@@ skipping 121 matching lines @@
   EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(),
                                            location_bar_focus_view_id_));
 
   // Focus the location bar, find something on the page, close the find box,
   // focus should go to the page.
   chrome::FocusLocationBar(browser());
   chrome::Find(browser());
   EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(),
                                            VIEW_ID_FIND_IN_PAGE_TEXT_FIELD));
   ui_test_utils::FindInPage(chrome::GetActiveTabContents(browser()),
-                            ASCIIToUTF16("a"), true, false, NULL);
+                            ASCIIToUTF16("a"), true, false, NULL, NULL);
   browser()->GetFindBarController()->EndFindSession(
       FindBarController::kKeepSelectionOnPage,
       FindBarController::kKeepResultsInFindBox);
   EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_TAB_CONTAINER));
 
   // Focus the location bar, open and close the find box, focus should return to
   // the location bar (same as before, just checking that http://crbug.com/23599
   // is fixed).
   chrome::FocusLocationBar(browser());
   EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(),
@@ skipping 22 matching lines @@
 
   chrome::Find(browser());
   EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(),
                                            VIEW_ID_FIND_IN_PAGE_TEXT_FIELD));
 
   FindBarTesting* find_bar =
       browser()->GetFindBarController()->find_bar()->GetFindBarTesting();
 
   // Search for 'a'.
   ui_test_utils::FindInPage(chrome::GetActiveTabContents(browser()),
-                            ASCIIToUTF16("a"), true, false, NULL);
+                            ASCIIToUTF16("a"), true, false, NULL, NULL);
   EXPECT_TRUE(ASCIIToUTF16("a") == find_bar->GetFindSelectedText());
 
   // Open another tab (tab B).
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_LOAD_STOP,
       content::NotificationService::AllSources());
   chrome::AddSelectedTabWithURL(browser(), url, content::PAGE_TRANSITION_TYPED);
   observer.Wait();
 
   // Make sure Find box is open.
   chrome::Find(browser());
   EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(),
                                            VIEW_ID_FIND_IN_PAGE_TEXT_FIELD));
 
   // Search for 'b'.
   ui_test_utils::FindInPage(chrome::GetActiveTabContents(browser()),
-                            ASCIIToUTF16("b"), true, false, NULL);
+                            ASCIIToUTF16("b"), true, false, NULL, NULL);
   EXPECT_TRUE(ASCIIToUTF16("b") == find_bar->GetFindSelectedText());
 
   // Set focus away from the Find bar (to the Location bar).
   chrome::FocusLocationBar(browser());
   EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(),
                                            location_bar_focus_view_id_));
 
   // Select tab A. Find bar should get focus.
   chrome::ActivateTabAt(browser(), 0, true);
   EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(),
@@ skipping 154 matching lines @@
           chrome::NOTIFICATION_FIND_RESULT_AVAILABLE, notification_source);
 
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
       browser(), ui::VKEY_V, true, false, false, false));
 
   ASSERT_NO_FATAL_FAILURE(observer.Wait());
   FindNotificationDetails details;
   ASSERT_TRUE(observer.GetDetailsFor(notification_source.map_key(), &details));
   EXPECT_TRUE(details.number_of_matches() > 0);
 }