Extract Profile-independent GCMService from GCMProfileService

chrome/browser/sync/profile_sync_service.cc

Index: chrome/browser/sync/profile_sync_service.cc
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index 31cfd6c022b12b675b85227b46b8a3a46454b1e9..ccc7ff55dd1afed61186418bdc8297dc50cc78a0 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -31,6 +31,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/services/gcm/gcm_profile_service.h"

[Andrew T Wilson (Slow), 2014/04/24 08:35:10]

Do we still need this include (gcm_profile_service.h)?

[bartfab (slow), 2014/04/24 08:41:02]

Yes, because GCMProfileServiceFactory::GetForProfile() returns a
GCMProfileService and the type must be fully defined to cast it to something
else (GCMService in this case).

However, I just realized that I should roll back the changes in this file anyway
- there is no need to cast from the Profile-dependent GCMProfileService to a
Profile-independent GCMService in a file that so obviously completely depends on
Profiles anyway (even the file name has "profile" in it :).

 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
+#include "chrome/browser/services/gcm/gcm_service.h"
 #include "chrome/browser/signin/about_signin_internals_factory.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
@@ -969,13 +970,13 @@ void ProfileSyncService::OnExperimentsChanged(
     profile()->GetPrefs()->SetBoolean(prefs::kGCMChannelEnabled,
                                       experiments.gcm_channel_state ==
                                           syncer::Experiments::ENABLED);
-    gcm::GCMProfileService* gcm_profile_service =
+    gcm::GCMService* gcm_service =
         gcm::GCMProfileServiceFactory::GetForProfile(profile());
-    if (gcm_profile_service) {
+    if (gcm_service) {
       if (experiments.gcm_channel_state == syncer::Experiments::SUPPRESSED)
-        gcm_profile_service->Stop();
+        gcm_service->Stop();
       else
-        gcm_profile_service->Start();
+        gcm_service->Start();
     }
   } else {
     profile()->GetPrefs()->ClearPref(prefs::kGCMChannelEnabled);