Fix issue 21587, a regression of CL 196020....

chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc

 // Copyright (c) 2009 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/file_path.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 32 matching lines @@
 const wchar_t kSearchKeywordKeys[] = {
   base::VKEY_F, base::VKEY_O, base::VKEY_O, 0
 };
 const wchar_t kSearchURL[] = L"http://www.foo.com/search?q={searchTerms}";
 const wchar_t kSearchShortName[] = L"foo";
 const wchar_t kSearchText[] = L"abc";
 const wchar_t kSearchTextKeys[] = {
   base::VKEY_A, base::VKEY_B, base::VKEY_C, 0
 };
 const char kSearchTextURL[] = "http://www.foo.com/search?q=abc";
+const wchar_t kSearchSingleChar[] = L"z";
+const wchar_t kSearchSingleCharKeys[] = { base::VKEY_Z, 0 };
+const char kSearchSingleCharURL[] = "http://www.foo.com/search?q=z";
+
 const char kHistoryPageURL[] = "chrome://history/#q=abc";
 
 const char kDesiredTLDHostname[] = "www.bar.com";
 const wchar_t kDesiredTLDKeys[] = {
   base::VKEY_B, base::VKEY_A, base::VKEY_R, 0
 };
 
 // Hostnames that shall be blocked by host resolver.
 const char *kBlockedHostnames[] = {
   "foo",
   "*.foo.com",
   "bar",
   "*.bar.com",
   "abc",
-  "*.abc.com"
+  "*.abc.com",
+  "history",
+  "z"
 };
 
 const struct TestHistoryEntry {
   const char* url;
   const wchar_t* title;
   const wchar_t* body;
   int visit_count;
   int typed_count;
   bool starred;
 } kHistoryEntries[] = {
@@ skipping 295 matching lines @@
   ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
   ASSERT_TRUE(popup_model->IsOpen());
   // ctrl-Enter triggers desired_tld feature, thus www.bar.com shall be opened.
   ASSERT_NO_FATAL_FAILURE(SendKey(base::VKEY_RETURN, true, false, false));
 
   GURL url = browser()->GetSelectedTabContents()->GetURL();
   EXPECT_STREQ(kDesiredTLDHostname, url.host().c_str());
 }
 
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, AltEnter) {
+  ASSERT_NO_FATAL_FAILURE(SetupHostResolver());
   browser()->FocusLocationBar();
 
   AutocompleteEditView* edit_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
 
   edit_view->SetUserText(L"chrome://history/");
   int tab_count = browser()->tab_count();
   // alt-Enter opens a new tab.
   ASSERT_NO_FATAL_FAILURE(SendKey(base::VKEY_RETURN, false, false, true));
   ASSERT_NO_FATAL_FAILURE(WaitForTabOpenOrClose(tab_count + 1));
@@ skipping 15 matching lines @@
   ASSERT_TRUE(popup_model->IsOpen());
 
   // Check if the default match result is Search Primary Provider.
   ASSERT_EQ(AutocompleteMatch::SEARCH_WHAT_YOU_TYPED,
             popup_model->result().default_match()->type);
 
   // Open the default match.
   ASSERT_NO_FATAL_FAILURE(SendKey(base::VKEY_RETURN, false, false, false));
   GURL url = browser()->GetSelectedTabContents()->GetURL();
   EXPECT_STREQ(kSearchTextURL, url.spec().c_str());
+
+  // Test Enter to search a single character.

[Evan Martin, 2009/09/15 16:22:03]

This comment is a bit confusing, it makes it sound like you're testing that
pressing enter causes a single character search.
Maybe
"Test that entering a single character then Enter performs a search."

[James Su, 2009/09/16 01:22:46]

Done.

+  browser()->FocusLocationBar();
+  EXPECT_TRUE(edit_view->IsSelectAll());
+  ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchSingleCharKeys));
+  ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
+  ASSERT_TRUE(popup_model->IsOpen());
+  EXPECT_EQ(std::wstring(kSearchSingleChar), edit_view->GetText());
+
+  // Check if the default match result is Search Primary Provider.
+  ASSERT_EQ(AutocompleteMatch::SEARCH_WHAT_YOU_TYPED,
+            popup_model->result().default_match()->type);
+
+  // Open the default match.
+  ASSERT_NO_FATAL_FAILURE(SendKey(base::VKEY_RETURN, false, false, false));
+  url = browser()->GetSelectedTabContents()->GetURL();
+  EXPECT_STREQ(kSearchSingleCharURL, url.spec().c_str());
 }
 
 // See http://crbug.com/20934: Omnibox keyboard behavior wrong for
 // "See recent pages in history"
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, EnterToOpenHistoryPage) {
   ASSERT_NO_FATAL_FAILURE(SetupHostResolver());
   ASSERT_NO_FATAL_FAILURE(SetupSearchEngine());
   ASSERT_NO_FATAL_FAILURE(SetupHistory());
 
   browser()->FocusLocationBar();
@@ skipping 64 matching lines @@
       break;
   }
 
   EXPECT_NE(old_text, edit_view->GetText());
 
   // Escape shall revert back to the default match item.
   ASSERT_NO_FATAL_FAILURE(SendKey(base::VKEY_ESCAPE, false, false, false));
   EXPECT_EQ(old_text, edit_view->GetText());
   EXPECT_EQ(old_selected_line, popup_model->selected_line());
 }