| 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 cb305b566b60eb50fa661adc7a1618c38910bde7..acbfb7cedca479b755b307509bfd61870c40b115 100644
|
| --- a/chrome/browser/sync/profile_sync_service.cc
|
| +++ b/chrome/browser/sync/profile_sync_service.cc
|
| @@ -34,8 +34,6 @@
|
| #include "chrome/browser/prefs/chrome_pref_service_factory.h"
|
| #include "chrome/browser/prefs/pref_service_syncable.h"
|
| #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/signin/about_signin_internals_factory.h"
|
| #include "chrome/browser/signin/chrome_signin_client_factory.h"
|
| #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
|
| @@ -63,7 +61,6 @@
|
| #include "chrome/common/url_constants.h"
|
| #include "chrome/grit/generated_resources.h"
|
| #include "components/autofill/core/common/autofill_pref_names.h"
|
| -#include "components/gcm_driver/gcm_driver.h"
|
| #include "components/invalidation/invalidation_service.h"
|
| #include "components/invalidation/profile_invalidation_provider.h"
|
| #include "components/password_manager/core/browser/password_store.h"
|
| @@ -1141,17 +1138,6 @@ void ProfileSyncService::OnExperimentsChanged(
|
|
|
| current_experiments_ = experiments;
|
|
|
| - // Handle preference-backed experiments first.
|
| - if (experiments.gcm_channel_state == syncer::Experiments::SUPPRESSED) {
|
| - profile()->GetPrefs()->SetBoolean(prefs::kGCMChannelEnabled, false);
|
| - gcm::GCMProfileServiceFactory::GetForProfile(profile())->driver()
|
| - ->Disable();
|
| - } else {
|
| - profile()->GetPrefs()->ClearPref(prefs::kGCMChannelEnabled);
|
| - gcm::GCMProfileServiceFactory::GetForProfile(profile())->driver()
|
| - ->Enable();
|
| - }
|
| -
|
| profile()->GetPrefs()->SetBoolean(prefs::kInvalidationServiceUseGCMChannel,
|
| experiments.gcm_invalidations_enabled);
|
| profile()->GetPrefs()->SetBoolean(
|
|
|