Allow space to accept keyword even when inline autocomplete is available.

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 236 matching lines @@
 
     TemplateURL* template_url = new TemplateURL();
     template_url->SetURL(kSearchURL, 0, 0);
     template_url->set_keyword(UTF8ToUTF16(kSearchKeyword));
     template_url->set_short_name(UTF8ToUTF16(kSearchShortName));
 
     model->Add(template_url);
     model->SetDefaultSearchProvider(template_url);
   }
 
-  void SetupHistory() {
+  void AddHistoryEntry(const TestHistoryEntry& entry, const Time& time) {
     Profile* profile = browser()->profile();
     HistoryService* history_service =
         profile->GetHistoryService(Profile::EXPLICIT_ACCESS);
     ASSERT_TRUE(history_service);
 
     if (!history_service->BackendLoaded()) {
       NotificationRegistrar registrar;
       registrar.Add(this, NotificationType::HISTORY_LOADED,
                     Source<Profile>(profile));
       ui_test_utils::RunMessageLoop();
     }
 
     BookmarkModel* bookmark_model = profile->GetBookmarkModel();
     ASSERT_TRUE(bookmark_model);
 
     if (!bookmark_model->IsLoaded()) {
       NotificationRegistrar registrar;
       registrar.Add(this, NotificationType::BOOKMARK_MODEL_LOADED,
                     Source<Profile>(profile));
       ui_test_utils::RunMessageLoop();
     }
 
+    GURL url(entry.url);
+    // Add everything in order of time. We don't want to have a time that
+    // is "right now" or it will nondeterministically appear in the results.
+    history_service->AddPageWithDetails(url, UTF8ToUTF16(entry.title),
+                                        entry.visit_count,
+                                        entry.typed_count, time, false,
+                                        history::SOURCE_BROWSED);
+    history_service->SetPageContents(url, UTF8ToUTF16(entry.body));
+    if (entry.starred)
+      bookmark_model->SetURLStarred(url, string16(), true);
+  }
+
+  void SetupHistory() {
     // Add enough history pages containing |kSearchText| to trigger
     // open history page url in autocomplete result.
     for (size_t i = 0; i < arraysize(kHistoryEntries); i++) {
-      const TestHistoryEntry& cur = kHistoryEntries[i];
-      GURL url(cur.url);
       // Add everything in order of time. We don't want to have a time that
       // is "right now" or it will nondeterministically appear in the results.
       Time t = Time::Now() - TimeDelta::FromHours(i + 1);
-      history_service->AddPageWithDetails(url, UTF8ToUTF16(cur.title),
-                                          cur.visit_count,
-                                          cur.typed_count, t, false,
-                                          history::SOURCE_BROWSED);
-      history_service->SetPageContents(url, UTF8ToUTF16(cur.body));
-      if (cur.starred) {
-        bookmark_model->SetURLStarred(url, string16(), true);
-      }
+      ASSERT_NO_FATAL_FAILURE(AddHistoryEntry(kHistoryEntries[i], t));
     }
   }
 
   void SetupHostResolver() {
     for (size_t i = 0; i < arraysize(kBlockedHostnames); ++i)
       host_resolver()->AddSimulatedFailure(kBlockedHostnames[i]);
   }
 
   void SetupComponents() {
     ASSERT_NO_FATAL_FAILURE(SetupHostResolver());
@@ skipping 425 matching lines @@
     ASSERT_TRUE(edit_view->model()->keyword().empty());
 
     edit_view->OnBeforePossibleChange();
     edit_view->model()->on_paste();
     edit_view->SetWindowTextAndCaretPos(text + L" bar", text.length() + 4);
     edit_view->OnAfterPossibleChange();
     ASSERT_FALSE(edit_view->model()->is_keyword_hint());
     ASSERT_TRUE(edit_view->model()->keyword().empty());
     ASSERT_EQ(text + L" bar", edit_view->GetText());
 
-    // Keyword shouldn't be accepted by pressing space with a selected range.
+    // Keyword could be accepted by pressing space with a selected range at the

[Peter Kasting, 2011/01/25 02:12:22]

Nit: could -> can

+    // end of text.
     edit_view->OnBeforePossibleChange();
     edit_view->OnInlineAutocompleteTextMaybeChanged(
         text + L"  ", text.length());
     edit_view->OnAfterPossibleChange();
     ASSERT_TRUE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(text, edit_view->model()->keyword());
     ASSERT_EQ(text + L"  ", edit_view->GetText());
 
     std::wstring::size_type start, end;
     edit_view->GetSelectionBounds(&start, &end);
     ASSERT_NE(start, end);
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, false, false, false));
-    ASSERT_TRUE(edit_view->model()->is_keyword_hint());
+    ASSERT_FALSE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(text, edit_view->model()->keyword());
-    ASSERT_EQ(text + L" ", edit_view->GetText());
+    ASSERT_EQ(std::wstring(), edit_view->GetText());
 
-    edit_view->GetSelectionBounds(&start, &end);
-    ASSERT_EQ(start, end);
+    edit_view->SetUserText(std::wstring());
+
+    // Space should accept keyword even when inline autocomplete is available.
+    const TestHistoryEntry kHistoryFoobar = {
+      "http://www.foobar.com", "Page foobar", kSearchText, 10000, 10000, true
+    };
+
+    // Add a history entry to trigger inline autocomplete when typing "foo".
+    ASSERT_NO_FATAL_FAILURE(
+        AddHistoryEntry(kHistoryFoobar, Time::Now() - TimeDelta::FromHours(1)));
+
+    // Type "foo" to trigger inline autocomplete.
+    ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchKeywordKeys));
+    ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
+    ASSERT_TRUE(edit_view->model()->popup_model()->IsOpen());
+    ASSERT_NE(text, edit_view->GetText());
+
+    // Keyword hint shouldn't be visible.
+    ASSERT_FALSE(edit_view->model()->is_keyword_hint());
+    ASSERT_TRUE(edit_view->model()->keyword().empty());
+
+    // Trigger keyword mode by space.
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, false, false, false));
+    ASSERT_FALSE(edit_view->model()->is_keyword_hint());
+    ASSERT_EQ(text, edit_view->model()->keyword());
+    ASSERT_TRUE(edit_view->GetText().empty());
   }
 
 };
 
 // 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 212 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewViewsTest, BasicTextOperations) {
   BasicTextOperationsTest();
 }
 
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewViewsTest, AcceptKeywordBySpace) {
   AcceptKeywordBySpaceTest();
 }
 
 #endif