Enabled pressing TAB to cycle through the Omnibox results.

chrome/browser/autocomplete/autocomplete_edit_view_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 <stdio.h>
 
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/time.h"
@@ skipping 986 matching lines @@
     // New temporary text is shown.
     ASSERT_EQ(selected_text, edit_view->GetText());
 
     // As the current selected item is the new default item, pressing Escape key
     // should revert all directly.
     ASSERT_TRUE(edit_view->model()->OnEscapeKeyPressed());
     ASSERT_EQ(old_text, edit_view->GetText());
     ASSERT_TRUE(edit_view->IsSelectAll());
   }
 
-  void TabMoveCursorToEndTest() {
+  void TabAcceptKeyword() {
     AutocompleteEditView* edit_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
 
-    edit_view->SetUserText(ASCIIToUTF16("Hello world"));
+    string16 text = UTF8ToUTF16(kSearchKeyword);
 
-    // Move cursor to the beginning.
-#if defined(OS_MACOSX)
-    // Home doesn't work on Mac trybot.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_A, ui::EF_CONTROL_DOWN));
-#else
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_HOME, 0));
-#endif
+    // Trigger keyword hint mode.
+    ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchKeywordKeys));
+    ASSERT_TRUE(edit_view->model()->is_keyword_hint());
+    ASSERT_EQ(text, edit_view->model()->keyword());
+    ASSERT_EQ(text, edit_view->GetText());
 
-    string16::size_type start, end;
-    edit_view->GetSelectionBounds(&start, &end);
-    EXPECT_EQ(0U, start);
-    EXPECT_EQ(0U, end);
+    // Trigger keyword mode by tab.
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0));
+    ASSERT_FALSE(edit_view->model()->is_keyword_hint());
+    ASSERT_EQ(text, edit_view->model()->keyword());
+    ASSERT_TRUE(edit_view->GetText().empty());
 
-    // Pressing tab should move cursor to the end.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0));
-
-    edit_view->GetSelectionBounds(&start, &end);
-    EXPECT_EQ(edit_view->GetText().size(), start);
-    EXPECT_EQ(edit_view->GetText().size(), end);
-
-    // The location bar should still have focus.
-    ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_LOCATION_BAR));
-
-    // Select all text.
-    edit_view->SelectAll(true);
-    EXPECT_TRUE(edit_view->IsSelectAll());
-    edit_view->GetSelectionBounds(&start, &end);
-    EXPECT_EQ(0U, start);
-    EXPECT_EQ(edit_view->GetText().size(), end);
-
-    // Pressing tab should move cursor to the end.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0));
-
-    edit_view->GetSelectionBounds(&start, &end);
-    EXPECT_EQ(edit_view->GetText().size(), start);
-    EXPECT_EQ(edit_view->GetText().size(), end);
-
-    // The location bar should still have focus.
-    ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_LOCATION_BAR));
-
-    // Pressing tab when cursor is at the end should change focus.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0));
-
-    ASSERT_FALSE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_LOCATION_BAR));
+    // Revert to keyword hint mode.
+    edit_view->model()->ClearKeyword(string16());
+    ASSERT_TRUE(edit_view->model()->is_keyword_hint());
+    ASSERT_EQ(text, edit_view->model()->keyword());
+    ASSERT_EQ(text, edit_view->GetText());
   }
 
   void PersistKeywordModeOnTabSwitch() {
     AutocompleteEditView* edit_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
 
     // Trigger keyword hint mode.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchKeywordKeys));
     ASSERT_TRUE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(edit_view->model()->keyword()));
@@ skipping 31 matching lines @@
 
     // Make sure inline autocomplete is triggerred.
     EXPECT_GT(old_text.length(), arraysize(kInlineAutocompleteText) - 1);
 
     // Press ctrl key.
     edit_view->model()->OnControlKeyChanged(true);
 
     // Inline autocomplete should still be there.
     EXPECT_EQ(old_text, edit_view->GetText());
   }
-
 };
 
 // Test if ctrl-* accelerators are workable in omnibox.
 // See http://crbug.com/19193: omnibox blocks ctrl-* commands
 //
 // Flaky on interactive tests (dbg), http://crbug.com/69433
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, FLAKY_BrowserAccelerators) {
   BrowserAcceleratorsTest();
 }
 
@@ skipping 41 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, NonSubstitutingKeywordTest) {
   NonSubstitutingKeywordTest();
 }
 
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, DeleteItem) {
   DeleteItemTest();
 }
 
-IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, TabMoveCursorToEnd) {
-  TabMoveCursorToEndTest();
+IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, TabAcceptKeyword) {
+  TabAcceptKeyword();
 }
 
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest,
                        PersistKeywordModeOnTabSwitch) {
   PersistKeywordModeOnTabSwitch();
 }
 
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest,
                        CtrlKeyPressedWithInlineAutocompleteTest) {
   CtrlKeyPressedWithInlineAutocompleteTest();
@@ skipping 183 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewViewsTest, DeleteItem) {
   DeleteItemTest();
 }
 
 // TODO(suzhe): This test is broken because of broken ViewID support when
 // enabling AutocompleteEditViewViews.
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewViewsTest,
                        DISABLED_TabMoveCursorToEnd) {
-  TabMoveCursorToEndTest();
+  TabAcceptKeyword();
 }
 
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewViewsTest,
                        PersistKeywordModeOnTabSwitch) {
   PersistKeywordModeOnTabSwitch();
 }
 
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewViewsTest,
                        CtrlKeyPressedWithInlineAutocompleteTest) {
   CtrlKeyPressedWithInlineAutocompleteTest();
 }
 
 #endif