Lazy initialization for PushMessagingEventRouter

chrome/browser/extensions/extension_service.cc

Index: chrome/browser/extensions/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 6ca023859a6f4daf4920098af5aa838332581882..c2a467f89c54592d64116835d030e7c8caba4214 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -38,7 +38,6 @@
 #include "chrome/browser/extensions/api/font_settings/font_settings_api.h"
 #include "chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.h"
 #include "chrome/browser/extensions/api/preference/preference_api.h"
-#include "chrome/browser/extensions/api/push_messaging/push_messaging_api.h"
 #include "chrome/browser/extensions/api/runtime/runtime_api.h"
 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
 #include "chrome/browser/extensions/app_notification_manager.h"
@@ -548,8 +547,6 @@ void ExtensionService::InitEventRouters() {
       new extensions::WebNavigationEventRouter(profile_));
   font_settings_event_router_.reset(
       new extensions::FontSettingsEventRouter(profile_));
-  push_messaging_event_router_.reset(
-      new extensions::PushMessagingEventRouter(profile_));
   media_galleries_private_event_router_.reset(
       new extensions::MediaGalleriesPrivateEventRouter(profile_));
 
@@ -567,13 +564,6 @@ void ExtensionService::InitEventRouters() {
   event_routers_initialized_ = true;
 }
 
-void ExtensionService::OnProfileSyncServiceShutdown() {
-  // TODO(akalin): Move this block to Shutdown() once
-  // http://crbug.com/153827 is fixed.
-  if (push_messaging_event_router_.get())
-    push_messaging_event_router_->Shutdown();
-}
-
 void ExtensionService::Shutdown() {
   // Do nothing for now.
 }