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 58af9f032b9709c1c4a9d1a41e7e6fe8c384a184..6e01b9f2b6ec762546eabf517d6fcb11cb8a66f2 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -37,7 +37,6 @@
 #include "chrome/browser/extensions/api/extension_action/extension_actions_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/app_notification_manager.h"
 #include "chrome/browser/extensions/app_sync_data.h"
@@ -550,8 +549,6 @@ void ExtensionService::InitEventRouters() {
       new extensions::PreferenceEventRouter(profile_));
   bookmark_event_router_.reset(new BookmarkExtensionEventRouter(
       BookmarkModelFactory::GetForProfile(profile_)));
-  push_messaging_event_router_.reset(
-      new extensions::PushMessagingEventRouter(profile_));
   media_galleries_private_event_router_.reset(
       new extensions::MediaGalleriesPrivateEventRouter(profile_));
 
@@ -569,13 +566,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.
 }