Some fixes split off from https://chromiumcodereview.appspot.com/9570064/ to try and make the omnib…

chrome/browser/ui/omnibox/omnibox_view_browsertest.cc

 // Copyright (c) 2012 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 134 matching lines @@
 #endif
 
 }  // namespace
 
 class OmniboxViewTest : public InProcessBrowserTest,
                         public content::NotificationObserver {
  protected:
   OmniboxViewTest()
       : location_bar_focus_view_id_(VIEW_ID_LOCATION_BAR) {
     set_show_window(true);
-    // TODO(mrossetti): HQP does not yet support DeleteMatch.
-    // http://crbug.com/82335
-    HistoryQuickProvider::set_disabled(true);
   }
 
   virtual void SetUpOnMainThread() {
     ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
     ASSERT_NO_FATAL_FAILURE(SetupComponents());
     browser()->FocusLocationBar();
     // Use Textfield's view id on pure views. See crbug.com/71144.
 #if defined(TOOLKIT_VIEWS)
     if (views::Widget::IsPureViews())
       location_bar_focus_view_id_ = VIEW_ID_OMNIBOX;
@@ skipping 73 matching lines @@
 
   void WaitForTabOpenOrClose(int expected_tab_count) {
     WaitForTabOpenOrCloseForBrowser(browser(), expected_tab_count);
   }
 
   void WaitForAutocompleteControllerDone() {
     OmniboxView* omnibox_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
 
     AutocompleteController* controller =
-        omnibox_view->model()->popup_model()->autocomplete_controller();
+        omnibox_view->model()->autocomplete_controller();
     ASSERT_TRUE(controller);
 
     if (controller->done())
       return;
 
     content::NotificationRegistrar registrar;
     registrar.Add(this,
                   chrome::NOTIFICATION_AUTOCOMPLETE_CONTROLLER_RESULT_READY,
                   content::Source<AutocompleteController>(controller));
 
@@ skipping 20 matching lines @@
     // Remove built-in template urls, like google.com, bing.com etc., as they
     // may appear as autocomplete suggests and interfere with our tests.
     model->SetDefaultSearchProvider(NULL);
     TemplateURLService::TemplateURLVector builtins = model->GetTemplateURLs();
     for (TemplateURLService::TemplateURLVector::const_iterator
          i = builtins.begin(); i != builtins.end(); ++i)
       model->Remove(*i);
 
     TemplateURL* template_url = new TemplateURL();
     template_url->SetURL(kSearchURL, 0, 0);
-    template_url->set_keyword(UTF8ToUTF16(kSearchKeyword));
-    template_url->set_short_name(UTF8ToUTF16(kSearchShortName));
-
+    template_url->set_keyword(ASCIIToUTF16(kSearchKeyword));
+    template_url->set_short_name(ASCIIToUTF16(kSearchShortName));
     model->Add(template_url);
     model->SetDefaultSearchProvider(template_url);
   }
 
   void AddHistoryEntry(const TestHistoryEntry& entry, const Time& time) {
     Profile* profile = browser()->profile();
     HistoryService* history_service =
         profile->GetHistoryService(Profile::EXPLICIT_ACCESS);
     ASSERT_TRUE(history_service);
 
@@ skipping 17 matching lines @@
     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_utils::AddIfNotBookmarked(bookmark_model, url, string16());
+    // Wait at least for the AddPageWithDetails() call to finish.
+    {
+      content::NotificationRegistrar registrar;
+      registrar.Add(this, chrome::NOTIFICATION_HISTORY_TYPED_URLS_MODIFIED,
+                    content::Source<Profile>(profile));
+      ui_test_utils::RunMessageLoop();
+      // We don't want to return until all observers have processed this
+      // notification, because some (e.g. the in-memory history database) may do
+      // something important.  Since we don't know where in the observer list we
+      // stand, just spin the message loop once more to allow the current
+      // callstack to complete.
+      ui_test_utils::RunAllPendingInMessageLoop();
+    }
   }
 
   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++) {
       // 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);
       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());
     ASSERT_NO_FATAL_FAILURE(SetupSearchEngine());
     ASSERT_NO_FATAL_FAILURE(SetupHistory());
   }
 
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) {
     switch (type) {
+      case content::NOTIFICATION_TAB_CLOSED:
       case content::NOTIFICATION_TAB_PARENTED:
-      case content::NOTIFICATION_TAB_CLOSED:
+      case chrome::NOTIFICATION_AUTOCOMPLETE_CONTROLLER_RESULT_READY:
+      case chrome::NOTIFICATION_BOOKMARK_MODEL_LOADED:
+      case chrome::NOTIFICATION_HISTORY_LOADED:
+      case chrome::NOTIFICATION_HISTORY_TYPED_URLS_MODIFIED:
       case chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED:
-      case chrome::NOTIFICATION_AUTOCOMPLETE_CONTROLLER_RESULT_READY:
-      case chrome::NOTIFICATION_HISTORY_LOADED:
-      case chrome::NOTIFICATION_BOOKMARK_MODEL_LOADED:
         break;
       default:
         FAIL() << "Unexpected notification type";
     }
-    MessageLoopForUI::current()->Quit();
+    MessageLoop::current()->Quit();
   }
 
   void BrowserAcceleratorsTest() {
     OmniboxView* omnibox_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
 
     int tab_count = browser()->tab_count();
 
     // Create a new Tab.
     browser()->NewTab();
@@ skipping 345 matching lines @@
     EXPECT_EQ(old_text, omnibox_view->GetText());
     omnibox_view->GetSelectionBounds(&start, &end);
     EXPECT_EQ(old_text.size(), start);
     EXPECT_EQ(old_text.size(), end);
   }
 
   void AcceptKeywordBySpaceTest() {
     OmniboxView* omnibox_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
 
-    string16 text = UTF8ToUTF16(kSearchKeyword);
+    string16 search_keyword(ASCIIToUTF16(kSearchKeyword));
 
     // Trigger keyword hint mode.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchKeywordKeys));
     ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(text, omnibox_view->model()->keyword());
-    ASSERT_EQ(text, omnibox_view->GetText());
+    ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+    ASSERT_EQ(search_keyword, omnibox_view->GetText());
 
     // Trigger keyword mode by space.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
     ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(text, omnibox_view->model()->keyword());
+    ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
     ASSERT_TRUE(omnibox_view->GetText().empty());
 
     // Revert to keyword hint mode.
     omnibox_view->model()->ClearKeyword(string16());
     ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(text, omnibox_view->model()->keyword());
-    ASSERT_EQ(text, omnibox_view->GetText());
+    ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+    ASSERT_EQ(search_keyword, omnibox_view->GetText());
 
     // Keyword should also be accepted by typing an ideographic space.
     omnibox_view->OnBeforePossibleChange();
-    omnibox_view->SetWindowTextAndCaretPos(text + WideToUTF16(L"\x3000"),
-                                        text.length() + 1, false, false);
+    omnibox_view->SetWindowTextAndCaretPos(search_keyword +
+        WideToUTF16(L"\x3000"), search_keyword.length() + 1, false, false);
     omnibox_view->OnAfterPossibleChange();
     ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(text, omnibox_view->model()->keyword());
+    ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
     ASSERT_TRUE(omnibox_view->GetText().empty());
 
     // Revert to keyword hint mode.
     omnibox_view->model()->ClearKeyword(string16());
     ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(text, omnibox_view->model()->keyword());
-    ASSERT_EQ(text, omnibox_view->GetText());
+    ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+    ASSERT_EQ(search_keyword, omnibox_view->GetText());
 
     // Keyword shouldn't be accepted by pressing space with a trailing
     // whitespace.
-    omnibox_view->SetWindowTextAndCaretPos(
-        text + char16(' '), text.length() + 1, false, false);
+    omnibox_view->SetWindowTextAndCaretPos(search_keyword + char16(' '),
+        search_keyword.length() + 1, false, false);
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
     ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(text, omnibox_view->model()->keyword());
-    ASSERT_EQ(text + ASCIIToUTF16("  "), omnibox_view->GetText());
+    ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+    ASSERT_EQ(search_keyword + ASCIIToUTF16("  "), omnibox_view->GetText());
 
     // Keyword shouldn't be accepted by deleting the trailing space.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, 0));
     ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(text, omnibox_view->model()->keyword());
-    ASSERT_EQ(text + char16(' '), omnibox_view->GetText());
+    ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+    ASSERT_EQ(search_keyword + char16(' '), omnibox_view->GetText());
 
     // Keyword shouldn't be accepted by pressing space before a trailing space.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
     ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(text, omnibox_view->model()->keyword());
-    ASSERT_EQ(text + ASCIIToUTF16("  "), omnibox_view->GetText());
+    ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+    ASSERT_EQ(search_keyword + ASCIIToUTF16("  "), omnibox_view->GetText());
 
     // Keyword should be accepted by pressing space in the middle of context and
     // just after the keyword.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, 0));
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_A, 0));
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
     ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(text, omnibox_view->model()->keyword());
+    ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
     ASSERT_EQ(ASCIIToUTF16("a "), omnibox_view->GetText());
 
     // Keyword shouldn't be accepted by pasting "foo bar".
     omnibox_view->SetUserText(string16());
     ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
     ASSERT_TRUE(omnibox_view->model()->keyword().empty());
 
     omnibox_view->OnBeforePossibleChange();
     omnibox_view->model()->on_paste();
-    omnibox_view->SetWindowTextAndCaretPos(text + ASCIIToUTF16(" bar"),
-                                        text.length() + 4, false, false);
+    omnibox_view->SetWindowTextAndCaretPos(search_keyword +
+        ASCIIToUTF16(" bar"), search_keyword.length() + 4, false, false);
     omnibox_view->OnAfterPossibleChange();
     ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
     ASSERT_TRUE(omnibox_view->model()->keyword().empty());
-    ASSERT_EQ(text + ASCIIToUTF16(" bar"), omnibox_view->GetText());
+    ASSERT_EQ(search_keyword + ASCIIToUTF16(" bar"), omnibox_view->GetText());
 
     // Keyword shouldn't be accepted for case like: "foo b|ar" -> "foo b |ar".
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
     ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
     ASSERT_TRUE(omnibox_view->model()->keyword().empty());
-    ASSERT_EQ(text + ASCIIToUTF16(" b ar"), omnibox_view->GetText());
+    ASSERT_EQ(search_keyword + ASCIIToUTF16(" b ar"), omnibox_view->GetText());
 
     // Keyword could be accepted by pressing space with a selected range at the
     // end of text.
     omnibox_view->OnBeforePossibleChange();
     omnibox_view->OnInlineAutocompleteTextMaybeChanged(
-        text + ASCIIToUTF16("  "), text.length());
+        search_keyword + ASCIIToUTF16("  "), search_keyword.length());
     omnibox_view->OnAfterPossibleChange();
     ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(text, omnibox_view->model()->keyword());
-    ASSERT_EQ(text + ASCIIToUTF16("  "), omnibox_view->GetText());
+    ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+    ASSERT_EQ(search_keyword + ASCIIToUTF16("  "), omnibox_view->GetText());
 
     size_t start, end;
     omnibox_view->GetSelectionBounds(&start, &end);
     ASSERT_NE(start, end);
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
     ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(text, omnibox_view->model()->keyword());
+    ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
     ASSERT_EQ(string16(), omnibox_view->GetText());
 
+    // Space should accept keyword even when inline autocomplete is available.
     omnibox_view->SetUserText(string16());
-
-    // Space should accept keyword even when inline autocomplete is available.
     const TestHistoryEntry kHistoryFoobar = {
-      "http://www.foobar.com", "Page foobar", kSearchText, 10000, 10000, true
+      "http://www.foobar.com", "Page foobar", kSearchText, 100, 100, 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(omnibox_view->model()->popup_model()->IsOpen());
-    ASSERT_NE(text, omnibox_view->GetText());
+    ASSERT_NE(search_keyword, omnibox_view->GetText());
 
     // Keyword hint shouldn't be visible.
     ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
     ASSERT_TRUE(omnibox_view->model()->keyword().empty());
 
     // Trigger keyword mode by space.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
     ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
-    ASSERT_EQ(text, omnibox_view->model()->keyword());
+    ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
     ASSERT_TRUE(omnibox_view->GetText().empty());
   }
 
   void NonSubstitutingKeywordTest() {
     OmniboxView* omnibox_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
     AutocompletePopupModel* popup_model = omnibox_view->model()->popup_model();
     ASSERT_TRUE(popup_model);
 
     TemplateURLService* template_url_service =
@@ skipping 113 matching lines @@
     omnibox_view->model()->OnUpOrDownKeyPressed(1);
     ASSERT_EQ(default_line + 1, popup_model->selected_line());
     omnibox_view->model()->OnUpOrDownKeyPressed(-1);
     ASSERT_EQ(default_line, popup_model->selected_line());
 
     selected_text = popup_model->result().match_at(default_line).fill_into_edit;
     // New temporary text is shown.
     ASSERT_EQ(selected_text, omnibox_view->GetText());
     ASSERT_FALSE(omnibox_view->IsSelectAll());
 
 #if 0

[mrossetti, 2012/03/02 18:11:46]

Note that this should be okay to re-enable now. I'll submit this as the dregs of
my earlier CL.

[Mark P, 2012/11/07 21:23:35]

You seem to have forgotten to reenable this.

     // TODO(mrossetti): http://crbug.com/82335
     // Delete the default item.
     popup_model->TryDeletingCurrentItem();
     ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
     // The selected line shouldn't be changed, but the default item should have
     // been changed.
     ASSERT_EQ(default_line, popup_model->selected_line());
     // Make sure the item is really deleted.
     EXPECT_NE(selected_text,
               popup_model->result().match_at(default_line).fill_into_edit);
@@ skipping 398 matching lines @@
 
   // Paste text.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_V, ui::EF_CONTROL_DOWN));
   ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
   ASSERT_TRUE(popup_model->IsOpen());
 
   // Inline autocomplete shouldn't be triggered.
   ASSERT_EQ(ASCIIToUTF16("abc"), omnibox_view->GetText());
 }
 #endif