Convert NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED to CallbackList

chrome/browser/ui/omnibox/omnibox_view_browsertest.cc

Index: chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
index 9f39b0e20e701743e6be1448a399f816ec0bf3dc..3c925944adbcec01b19aa8d27da5fae9438f5894 100644
--- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
@@ -263,11 +263,12 @@ class OmniboxViewTest : public InProcessBrowserTest,
     ASSERT_TRUE(model);
 
     if (!model->loaded()) {
-      content::NotificationRegistrar registrar;
-      registrar.Add(this, chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
-                    content::Source<TemplateURLService>(model));
+      base::RunLoop run_loop;
+      scoped_ptr<TemplateURLService::Subscription> sub =
+          model->RegisterOnLoadedCallback(
+              content::GetQuitTaskForRunLoop(&run_loop));
       model->Load();
-      content::RunMessageLoop();
+      content::RunThisRunLoop(&run_loop);

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

Again, MessageLoopRunner?

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

Done.

     }
 
     ASSERT_TRUE(model->loaded());
@@ -364,7 +365,6 @@ class OmniboxViewTest : public InProcessBrowserTest,
       case chrome::NOTIFICATION_AUTOCOMPLETE_CONTROLLER_RESULT_READY:
       case chrome::NOTIFICATION_HISTORY_LOADED:
       case chrome::NOTIFICATION_HISTORY_URLS_MODIFIED:
-      case chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED:
         break;
       default:
         FAIL() << "Unexpected notification type";