Make invalidations work for Chrome OS Kiosk Apps.

chrome/browser/invalidation/gcm_invalidation_bridge.h

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 971148ba0e3bcb4d525e5052660f7d969c349550..9bbaf97bf338107c2ca1044ba06adbf981962429 100644
--- a/chrome/browser/invalidation/gcm_invalidation_bridge.h
+++ b/chrome/browser/invalidation/gcm_invalidation_bridge.h
@@ -14,14 +14,18 @@
 #include "google_apis/gcm/gcm_client.h"
 #include "sync/notifier/gcm_network_channel_delegate.h"
 
-class Profile;
-
 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
@@ -33,7 +37,8 @@ class GCMInvalidationBridge : public gcm::GCMAppHandler,
  public:
   class Core;
 
-  explicit GCMInvalidationBridge(Profile* profile);
+  GCMInvalidationBridge(gcm::GCMProfileService* gcm_profile_service,
+                        InvalidationAuthProvider* auth_provider);
   virtual ~GCMInvalidationBridge();
 
   // OAuth2TokenService::Consumer implementation.
@@ -75,9 +80,8 @@ class GCMInvalidationBridge : public gcm::GCMAppHandler,
       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_;