Remove gcm channel state supported by sync service.

This is not longer needed after we have a generic gcm channel state.

BUG=447016
TEST=none
TBR=kalman@chromium.org

Review URL: https://codereview.chromium.org/897793002

Cr-Commit-Position: refs/heads/master@{#314695}

2 files changed, 0 insertions, 23 deletions

diff --git a/sync/internal_api/public/util/experiments.h b/sync/internal_api/public/util/experiments.h
index d2b82c6..16fa149 100644
--- a/sync/internal_api/public/util/experiments.h
+++ b/sync/internal_api/public/util/experiments.h
@@ -13,29 +13,20 @@ namespace syncer {
 
 const char kFaviconSyncTag[] = "favicon_sync";
 const char kPreCommitUpdateAvoidanceTag[] = "pre_commit_update_avoidance";
-const char kGCMChannelTag[] = "gcm_channel";
 const char kEnhancedBookmarksTag[] = "enhanced_bookmarks";
 const char kGCMInvalidationsTag[] = "gcm_invalidations";
 const char kWalletSyncTag[] = "wallet_sync";
 
 // A structure to hold the enable status of experimental sync features.
 struct Experiments {
-  enum GCMChannelState {
-    UNSET,
-    SUPPRESSED,
-    ENABLED,
-  };
-
   Experiments()
       : favicon_sync_limit(200),
-        gcm_channel_state(UNSET),
         enhanced_bookmarks_enabled(false),
         gcm_invalidations_enabled(true),  // By default GCM channel is enabled.
         wallet_sync_enabled(false) {}
 
   bool Matches(const Experiments& rhs) {
     return (favicon_sync_limit == rhs.favicon_sync_limit &&
-            gcm_channel_state == rhs.gcm_channel_state &&
             enhanced_bookmarks_enabled == rhs.enhanced_bookmarks_enabled &&
             enhanced_bookmarks_ext_id == rhs.enhanced_bookmarks_ext_id &&
             gcm_invalidations_enabled == rhs.gcm_invalidations_enabled &&
@@ -45,9 +36,6 @@ struct Experiments {
   // The number of favicons that a client is permitted to sync.
   int favicon_sync_limit;
 
-  // Enable state of the GCM channel.
-  GCMChannelState gcm_channel_state;
-
   // Enable the enhanced bookmarks sync datatype.
   bool enhanced_bookmarks_enabled;
 
diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc
index 1655a24..36c27ba 100644
--- a/sync/internal_api/sync_manager_impl.cc
+++ b/sync/internal_api/sync_manager_impl.cc
@@ -970,17 +970,6 @@ bool SyncManagerImpl::ReceivedExperiment(Experiments* experiments) {
     // know about this.
   }
 
-  ReadNode gcm_channel_node(&trans);
-  if (gcm_channel_node.InitByClientTagLookup(
-          syncer::EXPERIMENTS,
-          syncer::kGCMChannelTag) == BaseNode::INIT_OK &&
-      gcm_channel_node.GetExperimentsSpecifics().gcm_channel().has_enabled()) {
-    experiments->gcm_channel_state =
-        (gcm_channel_node.GetExperimentsSpecifics().gcm_channel().enabled() ?
-         syncer::Experiments::ENABLED : syncer::Experiments::SUPPRESSED);
-    found_experiment = true;
-  }
-
   ReadNode enhanced_bookmarks_node(&trans);
   if (enhanced_bookmarks_node.InitByClientTagLookup(
           syncer::EXPERIMENTS, syncer::kEnhancedBookmarksTag) ==