Adjust the Find test for unselectable test so that it has the right expectati...

chrome/browser/ui/find_bar/find_bar_host_browsertest.cc

 // Copyright (c) 2011 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/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
@@ skipping 411 matching lines @@
   EXPECT_EQ(0, FindInPageWchar(tab, L"goa ",
                                kFwd, kIgnoreCase, &ordinal));
   EXPECT_EQ(0, ordinal);
   // Remove the space, should be back to '3 out of 6')
   EXPECT_EQ(6, FindInPageWchar(tab, L"goa",
                                kFwd, kIgnoreCase, &ordinal));
   EXPECT_EQ(3, ordinal);
 }
 
 // Load a page with no selectable text and make sure we don't crash.
-IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindUnSelectableText) {
+IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindUnselectableText) {
   ASSERT_TRUE(test_server()->Start());
 
   // First we navigate to our page.
   GURL url = test_server()->GetURL(kUserSelectPage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   int ordinal = 0;
   TabContents* tab = browser()->GetSelectedTabContents();
-
-  int match_count =
-      FindInPageWchar(tab, L"text", kFwd, kIgnoreCase, &ordinal);
-  // TODO(finnur): These two values are currently 0 and 0 but will change to
-  // 1 and 1 when we merge down a fix for un-selectable text in patch from
-  // revision 75784 (https://bugs.webkit.org/show_bug.cgi?id=52367). Once the
-  // patch has been rolled into Chromium I'll change this back to check for 1
-  // explicitly (as opposed to using equality).
-  EXPECT_EQ(match_count, ordinal);
+  EXPECT_EQ(1, FindInPageWchar(tab, L"text", kFwd, kIgnoreCase, &ordinal));
+  EXPECT_EQ(1, ordinal);
 }
 
 // Try to reproduce the crash seen in issue 1341577.
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindCrash_Issue1341577) {
   ASSERT_TRUE(test_server()->Start());
 
   // First we navigate to our page.
   GURL url = test_server()->GetURL(kCrashPage);
   ui_test_utils::NavigateToURL(browser(), url);
 
@@ skipping 619 matching lines @@
 
   TabContents* tab = browser()->GetSelectedTabContents();
   int ordinal = 0;
   FindInPageWchar(tab, L"link", kFwd, kIgnoreCase, &ordinal);
   EXPECT_EQ(ordinal, 1);
 
   // End the find session, click on the link.
   tab->StopFinding(FindBarController::kActivateSelection);
   EXPECT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser()));
 }