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 eb0ac9fc0ee602694358d6bc7c92d2adbc385f07..1381593469e2b7a974cb686ee8e93a802cb479d9 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -35,7 +35,6 @@
 #include "chrome/browser/extensions/api/app_runtime/app_runtime_api.h"
 #include "chrome/browser/extensions/api/declarative/rules_registry_service.h"
 #include "chrome/browser/extensions/api/extension_action/extension_actions_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"
@@ -525,8 +524,6 @@ void ExtensionService::InitEventRouters() {
   browser_event_router_.reset(new extensions::BrowserEventRouter(profile_));
   bookmark_event_router_.reset(new BookmarkExtensionEventRouter(
       BookmarkModelFactory::GetForProfile(profile_)));
-  push_messaging_event_router_.reset(
-      new extensions::PushMessagingEventRouter(profile_));
 
 #if defined(OS_CHROMEOS)
   FileBrowserEventRouterFactory::GetForProfile(
@@ -542,13 +539,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.
 }