Attempt to fix flaky OmniboxApiTest.Basic.

chrome/browser/extensions/extension_omnibox_apitest.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.

[Peter Kasting, 2010/06/02 02:57:19]

Nit: 2010

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/extensions/extension_apitest.h"
-#include "chrome/browser/history/history.h"
 #include "chrome/browser/location_bar.h"
 #include "chrome/browser/profile.h"
+#include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/ui_test_utils.h"
 
 namespace {
 
 std::wstring AutocompleteResultAsString(const AutocompleteResult& result) {
   std::wstring output(StringPrintf(L"{%d} ", result.size()));
   for (size_t i = 0; i < result.size(); ++i) {
@@ skipping 12 matching lines @@
  protected:
   LocationBar* GetLocationBar() const {
     return browser()->window()->GetLocationBar();
   }
 
   AutocompleteController* GetAutocompleteController() const {
     return GetLocationBar()->location_entry()->model()->popup_model()->
         autocomplete_controller();
   }
 
-  void WaitForHistoryBackendToLoad() {
-    HistoryService* history_service =
-        browser()->profile()->GetHistoryService(Profile::EXPLICIT_ACCESS);
-    if (!history_service->BackendLoaded())
-      ui_test_utils::WaitForNotification(NotificationType::HISTORY_LOADED);
+  void WaitForTemplateURLModelToLoad() {
+    TemplateURLModel* model =
+        browser()->profile()->GetTemplateURLModel();
+    model->Load();
+    if (!model->loaded()) {
+      ui_test_utils::WaitForNotification(
+          NotificationType::TEMPLATE_URL_MODEL_LOADED);
+    }
   }
 
   void WaitForAutocompleteDone(AutocompleteController* controller) {
     while (!controller->done()) {
       ui_test_utils::WaitForNotification(
           NotificationType::AUTOCOMPLETE_CONTROLLER_DEFAULT_MATCH_UPDATED);
     }
   }
 };
 
 IN_PROC_BROWSER_TEST_F(OmniboxApiTest, Basic) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableExperimentalExtensionApis);
 
   ASSERT_TRUE(StartHTTPServer());
   ASSERT_TRUE(RunExtensionTest("omnibox")) << message_;
 
-  // The results depend on the history backend being loaded. Make sure it is
+  // The results depend on the TemplateURLModel being loaded. Make sure it is
   // loaded so that the autocomplete results are consistent.
-  WaitForHistoryBackendToLoad();
+  WaitForTemplateURLModelToLoad();
 
   LocationBar* location_bar = GetLocationBar();
   AutocompleteController* autocomplete_controller = GetAutocompleteController();
 
   // Test that our extension's keyword is suggested to us when we partially type
   // it.
   {
     autocomplete_controller->Start(L"keywor", std::wstring(),
                                    true, false, false);
 
@@ skipping 43 matching lines @@
   }
 
   {
     ResultCatcher catcher;
     autocomplete_controller->Start(L"keyword command", std::wstring(),
                                    true, false, false);
     location_bar->AcceptInput();
     EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   }
 }