[AF Wallet] Remove the feature flag for wallet data sync

This CL is doing a post-launch cleanup. A follow-up CL will remove metrics that were needed only for the launch. Bug: 936308 Change-Id: I791cac1f29cda2ee8fc8c45569f1f5807d1e4ab9 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1608703 Commit-Queue: Jan Krcal <jkrcal@chromium.org> Reviewed-by: John Wu <jzw@chromium.org> Reviewed-by: Marc Treib <treib@chromium.org> Cr-Commit-Position: refs/heads/master@{#659450}
Denger-Network · May 14, 2019 · e0b7b76 · e0b7b76
1 parent 774ece1
commit e0b7b76
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 25 deletions.
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
@@ -3244,11 +3244,6 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kSyncUSSAutofillProfileDescription, kOsAll,
      FEATURE_VALUE_TYPE(switches::kSyncUSSAutofillProfile)},
 
-    {"sync-USS-autofill-wallet-data",
-     flag_descriptions::kSyncUSSAutofillWalletDataName,
-     flag_descriptions::kSyncUSSAutofillWalletDataDescription, kOsAll,
-     FEATURE_VALUE_TYPE(switches::kSyncUSSAutofillWalletData)},
-
     {"sync-USS-autofill-wallet-metadata",
      flag_descriptions::kSyncUSSAutofillWalletMetadataName,
      flag_descriptions::kSyncUSSAutofillWalletMetadataDescription, kOsAll,

diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
@@ -1763,11 +1763,6 @@ const char kSyncUSSAutofillProfileName[] = "Enable USS for autofill profile";
 const char kSyncUSSAutofillProfileDescription[] =
     "Enables the new implementation of autofill profile sync";
 
-const char kSyncUSSAutofillWalletDataName[] =
-    "Enable USS for autofill wallet data";
-const char kSyncUSSAutofillWalletDataDescription[] =
-    "Enables the new implementation of autofill walet data sync";
-
 const char kSyncUSSAutofillWalletMetadataName[] =
     "Enable USS for autofill wallet metadata";
 const char kSyncUSSAutofillWalletMetadataDescription[] =

diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
@@ -1058,9 +1058,6 @@ extern const char kSyncSupportSecondaryAccountDescription[];
 extern const char kSyncUSSAutofillProfileName[];
 extern const char kSyncUSSAutofillProfileDescription[];
 
-extern const char kSyncUSSAutofillWalletDataName[];
-extern const char kSyncUSSAutofillWalletDataDescription[];
-
 extern const char kSyncUSSAutofillWalletMetadataName[];
 extern const char kSyncUSSAutofillWalletMetadataDescription[];
 

diff --git a/chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc b/chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc
@@ -336,8 +336,7 @@ class SingleClientWalletWithAccountStorageSyncTest
  public:
   SingleClientWalletWithAccountStorageSyncTest() {
     InitWithFeatures(
-        /*enabled_features=*/{switches::kSyncUSSAutofillWalletData,
-                              autofill::features::
+        /*enabled_features=*/{autofill::features::
                                   kAutofillEnableAccountWalletStorage},
         /*disabled_features=*/{});
   }
@@ -1417,7 +1416,6 @@ class SingleClientWalletSecondaryAccountSyncTest
   SingleClientWalletSecondaryAccountSyncTest() {
     InitWithFeatures(
         /*enabled_features=*/{switches::kSyncSupportSecondaryAccount,
-                              switches::kSyncUSSAutofillWalletData,
                               autofill::features::
                                   kAutofillEnableAccountWalletStorage},
         /*disabled_features=*/{});

diff --git a/components/sync/driver/profile_sync_service.cc b/components/sync/driver/profile_sync_service.cc
@@ -1289,8 +1289,7 @@ void ProfileSyncService::ConfigureDataTypeManager(ConfigureReason reason) {
   if (use_transport_only_mode) {
     ModelTypeSet allowed_types = {USER_CONSENTS};
 
-    if (autofill_enable_account_wallet_storage_ &&
-        base::FeatureList::IsEnabled(switches::kSyncUSSAutofillWalletData)) {
+    if (autofill_enable_account_wallet_storage_) {
       if (!GetUserSettings()->IsUsingSecondaryPassphrase() ||
           base::FeatureList::IsEnabled(
               switches::

diff --git a/components/sync/driver/sync_driver_switches.cc b/components/sync/driver/sync_driver_switches.cc
@@ -75,10 +75,6 @@ const base::Feature kSyncUSSPasswords{"SyncUSSPasswords",
 const base::Feature kSyncUSSAutofillProfile{"SyncUSSAutofillProfile",
                                             base::FEATURE_DISABLED_BY_DEFAULT};
 
-// Enable USS implementation of autofill wallet datatype.
-const base::Feature kSyncUSSAutofillWalletData{
-    "SyncUSSAutofillWalletData", base::FEATURE_ENABLED_BY_DEFAULT};
-
 // Enable USS implementation of autofill wallet metadata datatype.
 const base::Feature kSyncUSSAutofillWalletMetadata{
     "SyncUSSAutofillWalletMetadata", base::FEATURE_DISABLED_BY_DEFAULT};

diff --git a/components/sync/driver/sync_driver_switches.h b/components/sync/driver/sync_driver_switches.h
@@ -34,7 +34,6 @@ extern const base::Feature kSyncSupportSecondaryAccount;
 extern const base::Feature kSyncUSSBookmarks;
 extern const base::Feature kSyncUSSPasswords;
 extern const base::Feature kSyncUSSAutofillProfile;
-extern const base::Feature kSyncUSSAutofillWalletData;
 extern const base::Feature kSyncUSSAutofillWalletMetadata;
 
 }  // namespace switches

diff --git a/ios/web_view/internal/web_view_web_main_parts.mm b/ios/web_view/internal/web_view_web_main_parts.mm
@@ -53,8 +53,7 @@
   std::string enable_features = base::JoinString(
       {autofill::features::kAutofillEnableAccountWalletStorage.name,
        autofill::features::kAutofillAlwaysShowServerCardsInSyncTransport.name,
-       switches::kSyncSupportSecondaryAccount.name,
-       switches::kSyncUSSAutofillWalletData.name},
+       switches::kSyncSupportSecondaryAccount.name},
       ",");
   std::string disabled_features = base::JoinString(
       {// Allows form_structure.cc to run heuristics on single field forms.