Add a test for FindInPage after selecting text.

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 35 matching lines @@
 const std::string kFrameData = "framedata_general.html";
 const std::string kUserSelectPage = "user-select.html";
 const std::string kCrashPage = "crash_1341577.html";
 const std::string kTooFewMatchesPage = "bug_1155639.html";
 const std::string kLongTextareaPage = "large_textarea.html";
 const std::string kEndState = "end_state.html";
 const std::string kPrematureEnd = "premature_end.html";
 const std::string kMoveIfOver = "move_if_obscuring.html";
 const std::string kBitstackCrash = "crash_14491.html";
 const std::string kSelectChangesOrdinal = "select_changes_ordinal.html";
+const std::string kStartAfterSelection = "start_after_selection.html";
 const std::string kSimple = "simple.html";
 const std::string kLinkPage = "link.html";
 
 const bool kBack = false;
 const bool kFwd = true;
 
 const bool kIgnoreCase = false;
 const bool kCaseSensitive = true;
 
 const int kMoveIterations = 30;
@@ skipping 314 matching lines @@
   // from there to the 3rd instance of 'google'.
   EXPECT_EQ(4, FindInPageWchar(tab,
                                L"google",
                                kFwd, kIgnoreCase, &ordinal));
   EXPECT_EQ(3, ordinal);
 
   // End the find session.
   tab->find_tab_helper()->StopFinding(FindBarController::kKeepSelectionOnPage);
 }
 
+// This tests that we start searching after selected text.
+IN_PROC_BROWSER_TEST_F(FindInPageControllerTest,
+                       StartSearchAfterSelection) {
+  // First we navigate to our test content.
+  GURL url = GetURL(kStartAfterSelection);

[Peter Kasting, 2012/09/05 21:22:59]

Nit: Can inline into next statement

[mkosiba (inactive), 2012/09/10 18:45:23]

Done.

+  ui_test_utils::NavigateToURL(browser(), url);
+
+  TabContents* tab = browser()->GetActiveTabContents();
+  ASSERT_TRUE(NULL != tab);

[Peter Kasting, 2012/09/05 21:22:59]

Nit: "tab != NULL" (or ASSERT_FALSE(tab == NULL)) is preferred

[mkosiba (inactive), 2012/09/10 18:45:23]

Done.

+  int ordinal = 0;
+
+  // Move the selection to the text span.
+  std::string result;
+  ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(
+      tab->web_contents()->GetRenderViewHost(),
+      L"",

[Peter Kasting, 2012/09/05 21:22:59]

Nit: Use std::wstring()

[mkosiba (inactive), 2012/09/10 18:45:23]

Done.

+      L"window.domAutomationController.send(selectSpan());",
+      &result));
+
+  // Do a find-next after the selection. This should select the 2nd occurrence
+  // of the word 'find'.
+  EXPECT_EQ(4, FindInPageWchar(tab,

[Peter Kasting, 2012/09/05 21:22:59]

Nit: Feel free to collapse args onto one line (3 places)

[mkosiba (inactive), 2012/09/10 18:45:23]

Done.

+                               L"fi",
+                               kFwd, kIgnoreCase, &ordinal));
+  EXPECT_EQ(2, ordinal);
+
+  // Refine the search, current active match should not change (bug 129552).

[Peter Kasting, 2012/09/05 21:22:59]

Nit: Don't bother with the bug number.

[mkosiba (inactive), 2012/09/10 18:45:23]

Done.

+  EXPECT_EQ(4, FindInPageWchar(tab,
+                               L"find",
+                               kFwd, kIgnoreCase, &ordinal));
+  EXPECT_EQ(2, ordinal);
+
+  // Refine the search to 'findMe'. The first new match is before the current
+  // active match, the second one is after it. This verifies that refining a
+  // search doesn't reset it.
+  EXPECT_EQ(2, FindInPageWchar(tab,
+                               L"findMe",
+                               kFwd, kIgnoreCase, &ordinal));
+  EXPECT_EQ(2, ordinal);
+}
+
 // This test loads a page with frames and makes sure the ordinal returned makes
 // sense.
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPageMultiFramesOrdinal) {
   // First we navigate to our page.
   GURL url = GetURL(kFramePage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Search for 'a', which should make the first item active and return
   // '1 in 7' (1st ordinal of a total of 7 matches).
   TabContents* tab = browser()->GetActiveTabContents();
@@ skipping 844 matching lines @@
   ui_test_utils::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);
   browser()->CloseTab();
   EXPECT_TRUE(GetFindBarWindowInfo(&position2, NULL));
   EXPECT_EQ(position, position2);
 }