Lazy initialization for PushMessagingEventRouter

chrome/browser/extensions/api/push_messaging/push_messaging_api.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_PUSH_MESSAGING_PUSH_MESSAGING_API_H__
 #define CHROME_BROWSER_EXTENSIONS_API_PUSH_MESSAGING_PUSH_MESSAGING_API_H__
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher.h"
 #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_delegate.h"
+#include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_function.h"
+#include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 
 class Profile;
 
 namespace extensions {
 
 class PushMessagingInvalidationMapper;
@@ skipping 70 matching lines @@
   virtual void OnObfuscatedGaiaIdFetchSuccess(const std::string& gaia_id)
       OVERRIDE;
   virtual void OnObfuscatedGaiaIdFetchFailure(
       const GoogleServiceAuthError& error) OVERRIDE;
   scoped_ptr<ObfuscatedGaiaIdFetcher> fetcher_;
   bool interactive_;
 
   DISALLOW_COPY_AND_ASSIGN(PushMessagingGetChannelIdFunction);
 };
 
+class PushMessagingAPI : public ProfileKeyedService,
+                         public extensions::EventRouter::Observer {
+ public:
+  explicit PushMessagingAPI(Profile* profile);
+  virtual ~PushMessagingAPI();
+
+  // Convenience method to get the PushMessagingAPI for a profile.
+  static PushMessagingAPI* Get(Profile* profile);
+
+  PushMessagingEventRouter* push_messaging_event_router();

[akalin, 2012/12/10 23:44:13]

looks like this is used only for testing.  Can you rename to
GetPushMessagingEventRouterForTest()?

Does the test need the lazy-init behavior?  If not, can you make it just a plain
accessor and put the lazy-init in OnListenerAdded?  If it does, maybe you can
make the test explicitly initialize the router (in SetUp) or something?

[Joe Thomas, 2012/12/11 21:57:04]

Done. Initializing the event router on SetUpOnMainThread().

+
+  // ProfileKeyedService implementation.
+  virtual void Shutdown() OVERRIDE;
+
+  // EventRouter::Observer implementation.
+  virtual void OnListenerAdded(const extensions::EventListenerInfo& details)
+      OVERRIDE;
+
+ private:
+  Profile* profile_;
+
+  // Created lazily upon OnListenerAdded.
+  scoped_ptr<PushMessagingEventRouter> push_messaging_event_router_;
+};
+
 }  // namespace extension
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_PUSH_MESSAGING_PUSH_MESSAGING_API_H__