Index: chrome/browser/services/gcm/gcm_profile_service.cc |
diff --git a/chrome/browser/services/gcm/gcm_profile_service.cc b/chrome/browser/services/gcm/gcm_profile_service.cc |
index 9429a513c1497ff353523d537d85a3423808f8eb..aa90f7143cffcdeb4b187fb6d13860b3afef9eab 100644 |
--- a/chrome/browser/services/gcm/gcm_profile_service.cc |
+++ b/chrome/browser/services/gcm/gcm_profile_service.cc |
@@ -15,7 +15,6 @@ |
#include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
#include "chrome/browser/signin/signin_manager_factory.h" |
#include "chrome/common/chrome_constants.h" |
-#include "chrome/common/chrome_version_info.h" |
#include "chrome/common/pref_names.h" |
#include "components/gcm_driver/gcm_client_factory.h" |
#include "components/pref_registry/pref_registry_syncable.h" |
@@ -63,17 +62,9 @@ std::string GCMProfileService::GetGCMEnabledStateString(GCMEnabledState state) { |
// static |
void GCMProfileService::RegisterProfilePrefs( |
user_prefs::PrefRegistrySyncable* registry) { |
- // GCM support is only enabled by default for Canary/Dev/Custom builds. |
- chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); |
- bool on_by_default = false; |
- if (channel == chrome::VersionInfo::CHANNEL_UNKNOWN || |
- channel == chrome::VersionInfo::CHANNEL_CANARY || |
- channel == chrome::VersionInfo::CHANNEL_DEV) { |
- on_by_default = true; |
- } |
registry->RegisterBooleanPref( |
prefs::kGCMChannelEnabled, |
- on_by_default, |
+ true, |
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
} |