Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / invalidation / gcm_invalidation_bridge.h

diff --git a/src/chrome/browser/invalidation/gcm_invalidation_bridge.h b/src/chrome/browser/invalidation/gcm_invalidation_bridge.h
index 9bbaf97..a9d781e 100644 (file)
--- a/src/chrome/browser/invalidation/gcm_invalidation_bridge.h
+++ b/src/chrome/browser/invalidation/gcm_invalidation_bridge.h
@@ -14,18 +14,18 @@
 #include "google_apis/gcm/gcm_client.h"
 #include "sync/notifier/gcm_network_channel_delegate.h"
 
+class IdentityProvider;
+
 namespace base {
 class SingleThreadTaskRunner;
 }  // namespace base
 
 namespace gcm {
-class GCMProfileService;
+class GCMService;
 }  // 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
@@ -37,8 +37,8 @@ class GCMInvalidationBridge : public gcm::GCMAppHandler,
  public:
   class Core;
 
-  GCMInvalidationBridge(gcm::GCMProfileService* gcm_profile_service,
-                        InvalidationAuthProvider* auth_provider);
+  GCMInvalidationBridge(gcm::GCMService* gcm_service,
+                        IdentityProvider* identity_provider);
   virtual ~GCMInvalidationBridge();
 
   // OAuth2TokenService::Consumer implementation.
@@ -80,8 +80,8 @@ class GCMInvalidationBridge : public gcm::GCMAppHandler,
       gcm::GCMClient::Result result);
 
  private:
-  gcm::GCMProfileService* const gcm_profile_service_;
-  InvalidationAuthProvider* const auth_provider_;
+  gcm::GCMService* const gcm_service_;
+  IdentityProvider* const identity_provider_;
 
   base::WeakPtr<Core> core_;
   scoped_refptr<base::SingleThreadTaskRunner> core_thread_task_runner_;