Lazy initialization for PushMessagingEventRouter

chrome/browser/sync/profile_sync_service.cc

Index: chrome/browser/sync/profile_sync_service.cc
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index 03eb325dc1fb64e65885785e742dcf8f3e01ea57..866ea4c5d5d16767ac4ae2f1fd52874d097bcf27 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -25,8 +25,7 @@
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/defaults.h"
-#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_system.h"
+#include "chrome/browser/extensions/api/push_messaging/push_messaging_api.h"

[akalin, 2012/12/10 20:37:12]

remove this too

[Joe Thomas, 2012/12/10 22:43:58]

Done.

 #include "chrome/browser/net/chrome_cookie_notification_details.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ -518,12 +517,11 @@ void ProfileSyncService::EmitInvalidationForTest(
 void ProfileSyncService::Shutdown() {
   DCHECK(invalidator_registrar_.get());
   // TODO(akalin): Remove this once http://crbug.com/153827 is fixed.

[akalin, 2012/12/10 20:37:12]

remove this too

[Joe Thomas, 2012/12/10 22:43:58]

Done.

-  ExtensionService* const extension_service =
-      extensions::ExtensionSystem::Get(profile_)->extension_service();
-  // |extension_service| may be NULL if it was never initialized
-  // (e.g., extension sync wasn't enabled in tests).
-  if (extension_service)
-    extension_service->OnProfileSyncServiceShutdown();
+  extensions::PushMessagingAPI* const push_messaging_api =
+      extensions::PushMessagingAPI::Get(profile_);
+  // |push_messaging_api| may be NULL if the service was never initialized.
+  if (push_messaging_api)
+    push_messaging_api->OnProfileSyncServiceShutdown();
 
   // Reset |invalidator_registrar_| first so that ShutdownImpl cannot
   // use it.