Set default for prefs::kGCMChannelEnabled to true on all channels

chrome/browser/services/gcm/gcm_profile_service.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/services/gcm/gcm_profile_service.h"
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/services/gcm/gcm_driver.h"
 #include "chrome/browser/services/gcm/gcm_utils.h"
 #include "chrome/browser/signin/profile_identity_provider.h"
 #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"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "google_apis/gaia/identity_provider.h"
 #include "net/url_request/url_request_context_getter.h"
 
 #if !defined(OS_ANDROID)
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
@@ skipping 27 matching lines @@
       return "ALWAYS_DISABLED";
     default:
       NOTREACHED();
       return std::string();
   }
 }
 
 // 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);
 }
 
 GCMProfileService::GCMProfileService(
     Profile* profile,
     scoped_ptr<GCMClientFactory> gcm_client_factory)
     : profile_(profile) {
   DCHECK(!profile->IsOffTheRecord());
 
   scoped_refptr<base::SequencedWorkerPool> worker_pool(
@@ skipping 54 matching lines @@
     driver_->Shutdown();
     driver_.reset();
   }
 }
 
 void GCMProfileService::SetDriverForTesting(GCMDriver* driver) {
   driver_.reset(driver);
 }
 
 }  // namespace gcm