summaryrefslogtreecommitdiffstats
path: root/chrome/browser/instant/instant_browsertest.cc
diff options
context:
space:
mode:
authorsuzhe@google.com <suzhe@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-28 02:36:49 +0000
committersuzhe@google.com <suzhe@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-28 02:36:49 +0000
commit911696b92b1b5a666e59433b8b64303a2f4eae62 (patch)
treea47bab7021b5a34a532b1dae4140b8651558efd5 /chrome/browser/instant/instant_browsertest.cc
parentb7d6c22f8092a652d6b4572d4800e8a6aac6ccbe (diff)
downloadchromium_src-911696b92b1b5a666e59433b8b64303a2f4eae62.zip
chromium_src-911696b92b1b5a666e59433b8b64303a2f4eae62.tar.gz
chromium_src-911696b92b1b5a666e59433b8b64303a2f4eae62.tar.bz2
Hitting Tab should always move cursor to end of omnibox text.
BUG=66850 TEST=AutocompleteEditViewTest.TabMoveCursorToEnd and InstantTest.TabKey Review URL: http://codereview.chromium.org/5966006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72920 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/instant/instant_browsertest.cc')
-rw-r--r--chrome/browser/instant/instant_browsertest.cc12
1 files changed, 3 insertions, 9 deletions
diff --git a/chrome/browser/instant/instant_browsertest.cc b/chrome/browser/instant/instant_browsertest.cc
index 258b4f4..231109e 100644
--- a/chrome/browser/instant/instant_browsertest.cc
+++ b/chrome/browser/instant/instant_browsertest.cc
@@ -663,13 +663,7 @@ IN_PROC_BROWSER_TEST_F(InstantTest, OnCancelEvent) {
GetSearchStateAsString(preview_));
}
-#if !defined(OS_MACOSX)
-// Only passes on Mac. http://crbug.com/66850
-#define MAYBE_TabKey FAILS_TabKey
-#else
-#define MAYBE_TabKey TabKey
-#endif
-IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE_TabKey) {
+IN_PROC_BROWSER_TEST_F(InstantTest, TabKey) {
ASSERT_TRUE(test_server()->Start());
EnableInstant();
ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("search.html"));
@@ -685,7 +679,7 @@ IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE_TabKey) {
ASSERT_EQ(ASCIIToUTF16("abcdef"), location_bar_->location_entry()->GetText());
- EXPECT_EQ("true 0 0 2 2 a false abcdef false 6 6",
+ EXPECT_EQ("true 0 0 2 1 a false abcdef false 6 6",
GetSearchStateAsString(preview_));
// Pressing tab again to accept the current instant preview.
@@ -698,6 +692,6 @@ IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE_TabKey) {
ASSERT_TRUE(contents);
// Check that the value is reflected and onsubmit is called.
- EXPECT_EQ("true 1 0 2 2 a false abcdef true 6 6",
+ EXPECT_EQ("true 1 0 2 1 a false abcdef true 6 6",
GetSearchStateAsString(preview_));
}