Make GCMProfileService own GCMDriver, instead of deriving from it

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 627a732ba9bdc101375f08eaaba1042019408481..886b96589a8f96b553f977a41ff5eeac7b9903af 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -30,6 +30,7 @@
 #include "chrome/browser/net/chrome_cookie_notification_details.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/services/gcm/gcm_driver.h"
 #include "chrome/browser/services/gcm/gcm_profile_service.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
 #include "chrome/browser/signin/about_signin_internals_factory.h"
@@ -1025,9 +1026,9 @@ void ProfileSyncService::OnExperimentsChanged(
         gcm::GCMProfileServiceFactory::GetForProfile(profile());
     if (gcm_profile_service) {

[Nicolas Zea, 2014/05/19 21:04:06]

this should probably be if (gcm_profile_service &&
gcm_profile_service->driver())

[jianli, 2014/05/19 23:03:48]

Done.

       if (experiments.gcm_channel_state == syncer::Experiments::SUPPRESSED)
-        gcm_profile_service->Stop();
+        gcm_profile_service->driver()->Disable();
       else
-        gcm_profile_service->Start();
+        gcm_profile_service->driver()->Enable();
     }
   } else {
     profile()->GetPrefs()->ClearPref(prefs::kGCMChannelEnabled);