Remove gcm channel state supported by sync service.

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 <vector>
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/common/pref_names.h"
 #include "components/gcm_driver/gcm_driver.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 
 #if defined(OS_ANDROID)
 #include "components/gcm_driver/gcm_driver_android.h"
 #else
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/services/gcm/gcm_account_tracker.h"
 #include "chrome/browser/services/gcm/gcm_desktop_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/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/common/chrome_constants.h"
+#include "components/gcm_driver/gcm_channel_status_syncer.h"
 #include "components/gcm_driver/gcm_client_factory.h"
 #include "components/gcm_driver/gcm_driver_desktop.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "google_apis/gaia/account_tracker.h"
 #include "google_apis/gaia/identity_provider.h"
 #include "net/url_request/url_request_context_getter.h"
 #endif
 
 namespace gcm {
 
@@ skipping 74 matching lines @@
   gcm_account_tracker_.reset(
       new GCMAccountTracker(gaia_account_tracker.Pass(), driver_));
 
   gcm_account_tracker_->Start();
 }
 
 #endif  // !defined(OS_ANDROID)
 
 // static
 bool GCMProfileService::IsGCMEnabled(Profile* profile) {
-  return profile->GetPrefs()->GetBoolean(prefs::kGCMChannelEnabled);
+#if defined(OS_ANDROID)
+  return true;
+#else
+  return profile->GetPrefs()->GetBoolean(gcm::prefs::kGCMChannelStatus);
+#endif  // defined(OS_ANDROID)
 }
 
 // static
 void GCMProfileService::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
-  registry->RegisterBooleanPref(
-      prefs::kGCMChannelEnabled,
-      true,
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   PushMessagingServiceImpl::RegisterProfilePrefs(registry);
 }
 
 #if defined(OS_ANDROID)
 static GCMProfileService* debug_instance = nullptr;
 
 GCMProfileService::GCMProfileService(Profile* profile)
     : profile_(profile),
       push_messaging_service_(this, profile) {
   CHECK(!profile->IsOffTheRecord());
@@ skipping 60 matching lines @@
 
 void GCMProfileService::SetDriverForTesting(GCMDriver* driver) {
   driver_.reset(driver);
 #if !defined(OS_ANDROID)
   if (identity_observer_)
     identity_observer_.reset(new IdentityObserver(profile_, driver));
 #endif  // !defined(OS_ANDROID)
 }
 
 }  // namespace gcm