Convert NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED to CallbackList

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 338 matching lines @@
                      const content::NotificationSource& source) {
   content::NotificationRegistrar registrar;
   registrar.Add(observer, type, source);
   content::RunMessageLoop();
 }
 
 void WaitForTemplateURLServiceToLoad(TemplateURLService* service) {
   if (service->loaded())
     return;
 
-  content::WindowedNotificationObserver observer(
-      chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
-      content::Source<TemplateURLService>(service));
+  base::RunLoop run_loop;
+  scoped_ptr<TemplateURLService::Subscription> sub =
+      service->RegisterOnLoadedCallback(
+          content::GetQuitTaskForRunLoop(&run_loop));
   service->Load();
-  observer.Wait();
-
+  content::RunThisRunLoop(&run_loop);

[Avi (use Gerrit), 2013/10/02 22:27:52]

MessageLoopRunner

[Cait (Slow), 2013/10/03 15:36:45]

Done.

   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();
 }
@@ skipping 165 matching lines @@
 void HistoryEnumerator::HistoryQueryComplete(
     const base::Closure& quit_task,
     HistoryService::Handle request_handle,
     history::QueryResults* results) {
   for (size_t i = 0; i < results->size(); ++i)
     urls_.push_back((*results)[i].url());
   quit_task.Run();
 }
 
 }  // namespace ui_test_utils