| Index: chrome/browser/invalidation/gcm_invalidation_bridge.h
|
| diff --git a/chrome/browser/invalidation/gcm_invalidation_bridge.h b/chrome/browser/invalidation/gcm_invalidation_bridge.h
|
| index e8f920c7f2e80a9210c0838fffd77034e618e7b2..5e885c97ef661bc608777e683e0e4cb8e1d0e97a 100644
|
| --- a/chrome/browser/invalidation/gcm_invalidation_bridge.h
|
| +++ b/chrome/browser/invalidation/gcm_invalidation_bridge.h
|
| @@ -19,8 +19,14 @@ namespace base {
|
| class SingleThreadTaskRunner;
|
| } // namespace base
|
|
|
| +namespace gcm {
|
| +class GCMProfileService;
|
| +} // namespace gcm
|
| +
|
| namespace invalidation {
|
|
|
| +class InvalidationAuthProvider;
|
| +
|
| // GCMInvalidationBridge and GCMInvalidationBridge::Core implement functions
|
| // needed for GCMNetworkChannel. GCMInvalidationBridge lives on UI thread while
|
| // Core lives on IO thread. Core implements GCMNetworkChannelDelegate and posts
|
| @@ -31,7 +37,8 @@ class GCMInvalidationBridge : public OAuth2TokenService::Consumer,
|
| public:
|
| class Core;
|
|
|
| - explicit GCMInvalidationBridge(Profile* profile);
|
| + GCMInvalidationBridge(gcm::GCMProfileService* gcm_profile_service,
|
| + InvalidationAuthProvider* auth_provider);
|
| virtual ~GCMInvalidationBridge();
|
|
|
| // OAuth2TokenService::Consumer implementation.
|
| @@ -61,9 +68,8 @@ class GCMInvalidationBridge : public OAuth2TokenService::Consumer,
|
| gcm::GCMClient::Result result);
|
|
|
| private:
|
| - // GCMInvalidationBridge is owned by TiclInvalidationService therefore it is
|
| - // expected that profile_ pointer is valid throughout lifetime of this object.
|
| - Profile* profile_;
|
| + gcm::GCMProfileService* const gcm_profile_service_;
|
| + InvalidationAuthProvider* const auth_provider_;
|
|
|
| base::WeakPtr<Core> core_;
|
| scoped_refptr<base::SingleThreadTaskRunner> core_thread_task_runner_;
|
|
|