Extract Profile-independent GCMService from GCMProfileService

chrome/browser/invalidation/ticl_invalidation_service.cc

Index: chrome/browser/invalidation/ticl_invalidation_service.cc
diff --git a/chrome/browser/invalidation/ticl_invalidation_service.cc b/chrome/browser/invalidation/ticl_invalidation_service.cc
index a84d218da2d8784236dacfe3f1b9e9d82f756832..f073516f06d522401d1a42a92f7748444f3aa740 100644
--- a/chrome/browser/invalidation/ticl_invalidation_service.cc
+++ b/chrome/browser/invalidation/ticl_invalidation_service.cc
@@ -14,6 +14,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/services/gcm/gcm_profile_service.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
+#include "chrome/browser/services/gcm/gcm_service.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
@@ -401,10 +402,10 @@ void TiclInvalidationService::StartInvalidator(
       break;
     }
     case GCM_NETWORK_CHANNEL: {
-      gcm::GCMProfileService* gcm_profile_service =
+      gcm::GCMService* gcm_service =

[jianli, 2014/04/10 20:39:56]

ditto

[bartfab (slow), 2014/04/11 16:58:52]

This is the core of my work - I am removing the Profile dependency from
TiclInvalidationService. With this CL, TiclInvalidationService still gets its
GCMService from the GCMProfileServiceFactory. The next step will be to pass it
in as a dependency, so that TiclInvalidationService really only has a GCMService
and does not access GCMProfile* anymore.

           gcm::GCMProfileServiceFactory::GetForProfile(profile_);
       gcm_invalidation_bridge_.reset(
-          new GCMInvalidationBridge(gcm_profile_service, auth_provider_.get()));
+          new GCMInvalidationBridge(gcm_service, auth_provider_.get()));
       network_channel_creator =
           syncer::NonBlockingInvalidator::MakeGCMNetworkChannelCreator(
               request_context_,