Remove kAutofillWalletSyncExperimentEnabled.

This sync experiment has been at 100% of all users for a while.

Also, add the autofill_wallet type to sync/tools/testserver/chromiumsync.py. Previously, AutofillWalletDataTypeController::IsEnabled was returning false in the test environment because the sync setting was false. Now that we enable by default, the sync integration tests are covering this type. Which I assume is a good thing.

BUG=594182

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

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

5 files changed, 11 insertions, 22 deletions

diff --git a/sync/internal_api/public/util/experiments.h b/sync/internal_api/public/util/experiments.h
index 264702e..a0adf84 100644
--- a/sync/internal_api/public/util/experiments.h
+++ b/sync/internal_api/public/util/experiments.h
@@ -14,19 +14,17 @@ namespace syncer {
 const char kFaviconSyncTag[] = "favicon_sync";
 const char kPreCommitUpdateAvoidanceTag[] = "pre_commit_update_avoidance";
 const char kGCMInvalidationsTag[] = "gcm_invalidations";
-const char kWalletSyncTag[] = "wallet_sync";
 
 // A structure to hold the enable status of experimental sync features.
 struct Experiments {
   Experiments()
       : favicon_sync_limit(200),
-        gcm_invalidations_enabled(true),  // By default GCM channel is enabled.
-        wallet_sync_enabled(false) {}
+        // By default GCM channel is enabled:
+        gcm_invalidations_enabled(true) {}
 
   bool Matches(const Experiments& rhs) {
     return (favicon_sync_limit == rhs.favicon_sync_limit &&
-            gcm_invalidations_enabled == rhs.gcm_invalidations_enabled &&
-            wallet_sync_enabled == rhs.wallet_sync_enabled);
+            gcm_invalidations_enabled == rhs.gcm_invalidations_enabled);
   }
 
   // The number of favicons that a client is permitted to sync.
@@ -34,9 +32,6 @@ struct Experiments {
 
   // Enable invalidations over GCM channel.
   bool gcm_invalidations_enabled;
-
-  // Enable the Wallet Autofill sync datatype.
-  bool wallet_sync_enabled;
 };
 
 }  // namespace syncer
diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc
index fde8dc1..d286e42 100644
--- a/sync/internal_api/sync_manager_impl.cc
+++ b/sync/internal_api/sync_manager_impl.cc
@@ -990,17 +990,6 @@ bool SyncManagerImpl::ReceivedExperiment(Experiments* experiments) {
     }
   }
 
-  ReadNode wallet_sync_node(&trans);
-  if (wallet_sync_node.InitByClientTagLookup(
-          syncer::EXPERIMENTS, syncer::kWalletSyncTag) == BaseNode::INIT_OK) {
-    const sync_pb::WalletSyncFlags& wallet_sync =
-        wallet_sync_node.GetExperimentsSpecifics().wallet_sync();
-    if (wallet_sync.has_enabled()) {
-      experiments->wallet_sync_enabled = wallet_sync.enabled();
-      found_experiment = true;
-    }
-  }
-
   return found_experiment;
 }
 
diff --git a/sync/protocol/experiments_specifics.proto b/sync/protocol/experiments_specifics.proto
index 4fc0ada..e2f4ad4 100644
--- a/sync/protocol/experiments_specifics.proto
+++ b/sync/protocol/experiments_specifics.proto
@@ -73,5 +73,6 @@ message ExperimentsSpecifics {
   // No longer used as of M43.
   optional EnhancedBookmarksFlags obsolete_enhanced_bookmarks = 7;
   optional GcmInvalidationsFlags gcm_invalidations = 8;
-  optional WalletSyncFlags wallet_sync = 9;
+  // No longer used as of M51.
+  optional WalletSyncFlags obsolete_wallet_sync = 9;
 }
diff --git a/sync/protocol/proto_value_conversions.cc b/sync/protocol/proto_value_conversions.cc
index 327723c..4f7d987 100644
--- a/sync/protocol/proto_value_conversions.cc
+++ b/sync/protocol/proto_value_conversions.cc
@@ -441,7 +441,6 @@ scoped_ptr<base::DictionaryValue> ExperimentsSpecificsToValue(
   SET(favicon_sync, FaviconSyncFlagsToValue);
   SET_EXPERIMENT_ENABLED_FIELD(gcm_channel);
   SET_EXPERIMENT_ENABLED_FIELD(gcm_invalidations);
-  SET_EXPERIMENT_ENABLED_FIELD(wallet_sync);
   return value;
 }
 
diff --git a/sync/tools/testserver/chromiumsync.py b/sync/tools/testserver/chromiumsync.py
index 459f1e1..c07f84b 100644
--- a/sync/tools/testserver/chromiumsync.py
+++ b/sync/tools/testserver/chromiumsync.py
@@ -69,6 +69,7 @@ ALL_TYPES = (
     ARTICLE,
     AUTOFILL,
     AUTOFILL_PROFILE,
+    AUTOFILL_WALLET,
     AUTOFILL_WALLET_METADATA,
     BOOKMARK,
     DEVICE_INFO,
@@ -93,7 +94,7 @@ ALL_TYPES = (
     EXTENSION_SETTINGS,
     FAVICON_IMAGES,
     FAVICON_TRACKING,
-    WIFI_CREDENTIAL) = range(33)
+    WIFI_CREDENTIAL) = range(34)
 
 # An enumeration on the frequency at which the server should send errors
 # to the client. This would be specified by the url that triggers the error.
@@ -117,6 +118,7 @@ SYNC_TYPE_TO_DESCRIPTOR = {
     ARTICLE: SYNC_TYPE_FIELDS['article'],
     AUTOFILL: SYNC_TYPE_FIELDS['autofill'],
     AUTOFILL_PROFILE: SYNC_TYPE_FIELDS['autofill_profile'],
+    AUTOFILL_WALLET: SYNC_TYPE_FIELDS['autofill_wallet'],
     AUTOFILL_WALLET_METADATA: SYNC_TYPE_FIELDS['wallet_metadata'],
     BOOKMARK: SYNC_TYPE_FIELDS['bookmark'],
     DEVICE_INFO: SYNC_TYPE_FIELDS['device_info'],
@@ -513,6 +515,9 @@ class SyncDataModel(object):
                     parent_tag=ROOT_ID, sync_type=AUTOFILL),
       PermanentItem('google_chrome_autofill_profiles', name='Autofill Profiles',
                     parent_tag=ROOT_ID, sync_type=AUTOFILL_PROFILE),
+      PermanentItem('google_chrome_autofill_wallet',
+                    name='Autofill Wallet Items', parent_tag=ROOT_ID,
+                    sync_type=AUTOFILL_WALLET),
       PermanentItem('google_chrome_autofill_wallet_metadata',
                     name='Autofill Wallet Metadata', parent_tag=ROOT_ID,
                     sync_type=AUTOFILL_WALLET_METADATA),