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

chrome/browser/ui/pdf/pdf_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/file_util.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 89 matching lines @@
     // document, it'll wait for us to flush the renderer message loop twice and
     // also the browser's once, at which point we're guaranteed to have updated
     // the backingstore.  Hacky, but it works.
     // Note that we need to change the text each time, because if we don't the
     // renderer code will think the second message is to go to next result, but
     // there are none so the plugin will assert.
 
     string16 query = UTF8ToUTF16(
         std::string("xyzxyz" + base::IntToString(next_dummy_search_value_++)));
     ASSERT_EQ(0, ui_test_utils::FindInPage(
-        chrome::GetActiveTabContents(browser()), query, true, false, NULL));
+        chrome::GetActiveTabContents(browser()), query, true, false, NULL,
+                                     NULL));
   }
 
  private:
   // content::NotificationObserver
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) {
     if (type == chrome::NOTIFICATION_TAB_SNAPSHOT_TAKEN) {
       MessageLoopForUI::current()->Quit();
       FilePath reference = ui_test_utils::GetTestFilePath(
@@ skipping 136 matching lines @@
 // TODO(sanjeevr): http://crbug.com/79837
 #define MAYBE_FindAndCopy DISABLED_FindAndCopy
 #else
 #define MAYBE_FindAndCopy FindAndCopy
 #endif
 IN_PROC_BROWSER_TEST_F(PDFBrowserTest, MAYBE_FindAndCopy) {
   ASSERT_NO_FATAL_FAILURE(Load());
   // Verifies that find in page works.
   ASSERT_EQ(3, ui_test_utils::FindInPage(
       chrome::GetActiveTabContents(browser()), UTF8ToUTF16("adipiscing"),
-      true, false, NULL));
+      true, false, NULL, NULL));
 
   // Verify that copying selected text works.
   ui::Clipboard clipboard;
   // Reset the clipboard first.
   ui::Clipboard::ObjectMap objects;
   ui::Clipboard::ObjectMapParams params;
   params.push_back(std::vector<char>());
   objects[ui::Clipboard::CBF_TEXT] = params;
   clipboard.WriteObjects(ui::Clipboard::BUFFER_STANDARD, objects);
 
@@ skipping 79 matching lines @@
       chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
       std::wstring(),
       L"reloadPDF();"));
   observer.Wait();
 
   ASSERT_EQ("success",
             chrome::GetActiveWebContents(browser())->GetURL().query());
 }
 
 }  // namespace