Lazy initialization for PushMessagingEventRouter

chrome/browser/sync/profile_sync_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/profile_sync_service.h"
 
 #include <cstddef>
 #include <map>
 #include <set>
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/string16.h"
 #include "base/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
 #include "build/build_config.h"
 #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"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/token_service.h"
 #include "chrome/browser/signin/token_service_factory.h"
 #include "chrome/browser/sync/backend_migrator.h"
 #include "chrome/browser/sync/glue/change_processor.h"
 #include "chrome/browser/sync/glue/chrome_encryptor.h"
@@ skipping 470 matching lines @@
   syncer::ObjectIdSet notify_ids;
   notify_ids.insert(id);
 
   const syncer::ObjectIdInvalidationMap& invalidation_map =
       ObjectIdSetToInvalidationMap(notify_ids, payload);
   OnIncomingInvalidation(invalidation_map, syncer::REMOTE_INVALIDATION);
 }
 
 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.
   invalidator_registrar_.reset();
 
   ShutdownImpl(false);
 }
 
 void ProfileSyncService::ShutdownImpl(bool sync_disabled) {
   // First, we spin down the backend and wait for it to stop syncing completely
@@ skipping 1369 matching lines @@
   // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefined-behaviour-after-directly-calling-the-destru.
   ProfileSyncService* old_this = this;
   this->~ProfileSyncService();
   new(old_this) ProfileSyncService(
       new ProfileSyncComponentsFactoryImpl(profile,
                                            CommandLine::ForCurrentProcess()),
       profile,
       signin,
       behavior);
 }