Eliminate NOTIFICATION_HISTORY_LOADED notification

chrome/test/base/ui_test_utils.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 "chrome/test/base/ui_test_utils.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 31 matching lines @@
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/location_bar/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/find_in_page_observer.h"
 #include "components/app_modal/app_modal_dialog.h"
 #include "components/app_modal/app_modal_dialog_queue.h"
 #include "components/bookmarks/browser/bookmark_model.h"
+#include "components/history/core/browser/history_service_observer.h"
 #include "components/search_engines/template_url_service.h"
 #include "content/public/browser/dom_operation_notification_details.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/geolocation_provider.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
@@ skipping 295 matching lines @@
       new content::MessageLoopRunner;
   scoped_ptr<TemplateURLService::Subscription> subscription =
       service->RegisterOnLoadedCallback(
           message_loop_runner->QuitClosure());
   service->Load();
   message_loop_runner->Run();
 
   ASSERT_TRUE(service->loaded());
 }
 
-void WaitForHistoryToLoad(HistoryService* history_service) {
-  content::WindowedNotificationObserver history_loaded_observer(
-      chrome::NOTIFICATION_HISTORY_LOADED,
-      content::NotificationService::AllSources());
-  if (!history_service->BackendLoaded())
-    history_loaded_observer.Wait();
-}
-
 void DownloadURL(Browser* browser, const GURL& download_url) {
   base::ScopedTempDir downloads_directory;
   ASSERT_TRUE(downloads_directory.CreateUniqueTempDir());
   browser->profile()->GetPrefs()->SetFilePath(
       prefs::kDownloadDefaultDirectory, downloads_directory.path());
 
   content::DownloadManager* download_manager =
       content::BrowserContext::GetDownloadManager(browser->profile());
   scoped_ptr<content::DownloadTestObserver> observer(
       new content::DownloadTestObserverTerminal(
@@ skipping 149 matching lines @@
 HistoryEnumerator::~HistoryEnumerator() {}
 
 void HistoryEnumerator::HistoryQueryComplete(
     const base::Closure& quit_task,
     history::QueryResults* results) {
   for (size_t i = 0; i < results->size(); ++i)
     urls_.push_back((*results)[i].url());
   quit_task.Run();
 }
 
+// Wait for HistoryService to load.
+class WaitHistoryLoadedObserver : public history::HistoryServiceObserver {
+ public:
+  explicit WaitHistoryLoadedObserver(content::MessageLoopRunner* runner);
+  ~WaitHistoryLoadedObserver() override;
+
+  // history::HistoryServiceObserver:
+  void OnHistoryServiceLoaded(HistoryService* service) override;
+
+ private:
+  // weak
+  content::MessageLoopRunner* runner_;
+};
+
+WaitHistoryLoadedObserver::WaitHistoryLoadedObserver(
+    content::MessageLoopRunner* runner)
+    : runner_(runner) {
+}
+
+WaitHistoryLoadedObserver::~WaitHistoryLoadedObserver() {
+}
+
+void WaitHistoryLoadedObserver::OnHistoryServiceLoaded(
+    HistoryService* service) {
+  runner_->Quit();
+}
+
+void WaitForHistoryToLoad(HistoryService* history_service) {
+  if (!history_service->BackendLoaded()) {
+    scoped_refptr<content::MessageLoopRunner> runner =
+        new content::MessageLoopRunner;
+    WaitHistoryLoadedObserver observer(runner.get());
+    ScopedObserver<HistoryService, history::HistoryServiceObserver>
+        scoped_observer(&observer);
+    scoped_observer.Add(history_service);
+    runner->Run();
+  }
+}
+
 }  // namespace ui_test_utils