Extract Profile-independent GCMService from GCMProfileService

chrome/browser/invalidation/gcm_invalidation_bridge.cc

Index: chrome/browser/invalidation/gcm_invalidation_bridge.cc
diff --git a/chrome/browser/invalidation/gcm_invalidation_bridge.cc b/chrome/browser/invalidation/gcm_invalidation_bridge.cc
index 5925eda929e7fc6978a4534777ab2bb69daf6432..88d09719bbc2d22714263cbd472d72c70ad64467 100644
--- a/chrome/browser/invalidation/gcm_invalidation_bridge.cc
+++ b/chrome/browser/invalidation/gcm_invalidation_bridge.cc
@@ -7,7 +7,7 @@
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/invalidation/gcm_invalidation_bridge.h"
-#include "chrome/browser/services/gcm/gcm_profile_service.h"
+#include "chrome/browser/services/gcm/gcm_service.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
@@ -148,17 +148,17 @@ void GCMInvalidationBridge::Core::OnIncomingMessage(
 }
 
 GCMInvalidationBridge::GCMInvalidationBridge(
-    gcm::GCMProfileService* gcm_profile_service,
+    gcm::GCMService* gcm_service,
     IdentityProvider* identity_provider)
     : OAuth2TokenService::Consumer("gcm_network_channel"),
-      gcm_profile_service_(gcm_profile_service),
+      gcm_service_(gcm_service),
       identity_provider_(identity_provider),
       subscribed_for_incoming_messages_(false),
       weak_factory_(this) {}
 
 GCMInvalidationBridge::~GCMInvalidationBridge() {
   if (subscribed_for_incoming_messages_)
-    gcm_profile_service_->RemoveAppHandler(kInvalidationsAppId);
+    gcm_service_->RemoveAppHandler(kInvalidationsAppId);
 }
 
 scoped_ptr<syncer::GCMNetworkChannelDelegate>
@@ -244,17 +244,16 @@ void GCMInvalidationBridge::Register(
     syncer::GCMNetworkChannelDelegate::RegisterCallback callback) {
   DCHECK(CalledOnValidThread());
   // No-op if GCMClient is disabled.
-  if (gcm_profile_service_ == NULL)
+  if (gcm_service_ == NULL)
     return;
 
   std::vector<std::string> sender_ids;
   sender_ids.push_back(kInvalidationsSenderId);
-  gcm_profile_service_->Register(
-      kInvalidationsAppId,
-      sender_ids,
-      base::Bind(&GCMInvalidationBridge::RegisterFinished,
-                 weak_factory_.GetWeakPtr(),
-                 callback));
+  gcm_service_->Register(kInvalidationsAppId,
+                         sender_ids,
+                         base::Bind(&GCMInvalidationBridge::RegisterFinished,
+                                    weak_factory_.GetWeakPtr(),
+                                    callback));
 }
 
 void GCMInvalidationBridge::RegisterFinished(
@@ -273,11 +272,11 @@ void GCMInvalidationBridge::RegisterFinished(
 
 void GCMInvalidationBridge::SubscribeForIncomingMessages() {
   // No-op if GCMClient is disabled.
-  if (gcm_profile_service_ == NULL)
+  if (gcm_service_ == NULL)
     return;
 
   DCHECK(!subscribed_for_incoming_messages_);
-  gcm_profile_service_->AddAppHandler(kInvalidationsAppId, this);
+  gcm_service_->AddAppHandler(kInvalidationsAppId, this);
   subscribed_for_incoming_messages_ = true;
 }