| Index: sync/internal_api/public/util/experiments.h
|
| diff --git a/sync/internal_api/public/util/experiments.h b/sync/internal_api/public/util/experiments.h
|
| index d2b82c62363dadea5267785990b38c0991b6653b..16fa14972b2750c79c3f01308a63ea44f7445d75 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;
|
|
|
|
|