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

Adjust the Find test for unselectable test so that it has the right expectation now that my change has been merged down.

BUG=68494
TEST=Fixing a test.


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=71779

[ojan, 2011-01-18 17:57:53]

LGTM

On Tue, Jan 18, 2011 at 3:20 AM, <finnur@chromium.org> wrote:

> Reviewers: ojan,
>
> Description:
> Adjust the Find test for unselectable test so that it has the right
> expectation
> now that my change has been merged down.
>
> BUG=68494
> TEST=Fixing a test.
>
>
> Please review this at http://codereview.chromium.org/6289007/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src/
>
> Affected files:
>  M     chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
>
>
> Index: chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
> ===================================================================
> --- chrome/browser/ui/find_bar/find_bar_host_browsertest.cc     (revision
> 71590)
> +++ chrome/browser/ui/find_bar/find_bar_host_browsertest.cc     (working
> copy)
> @@ -429,7 +429,7 @@
>  }
>
>  // 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.
> @@ -438,15 +438,8 @@
>
>   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.
>
>
>