[M110 Merge] Clean up finch flag

AutofillEnableGetDetailsForEnrollParsingInUploadCardResponse (cherry picked from commit 7a068aa) Bug: 1403177 Change-Id: I9169f9a294bb95303700a2035b18b633c1d45936 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4122214 Reviewed-by: Siyu An <siyua@chromium.org> Commit-Queue: Vinny Persky <vinnypersky@google.com> Cr-Original-Commit-Position: refs/heads/main@{#1087208} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4128763 Cr-Commit-Position: refs/branch-heads/5481@{#107} Cr-Branched-From: 130f3e4-refs/heads/main@{#1084008}
chromium · Jan 3, 2023 · accf8af · accf8af
1 parent 185ca6f
commit accf8af
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 49 deletions.
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
@@ -9041,16 +9041,6 @@ const FeatureEntry kFeatureEntries[] = {
      FEATURE_VALUE_TYPE(commerce::kCommerceHintAndroid)},
 #endif
 
-    {"autofill-enable-get-details-for-enroll-parsing-in-upload-card-response",
-     flag_descriptions::
-         kAutofillEnableGetDetailsForEnrollParsingInUploadCardResponseName,
-     flag_descriptions::
-         kAutofillEnableGetDetailsForEnrollParsingInUploadCardResponseDescription,
-     kOsAll,
-     FEATURE_VALUE_TYPE(
-         autofill::features::
-             kAutofillEnableGetDetailsForEnrollParsingInUploadCardResponse)},
-
 #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
     {"enable-web-bluetooth-confirm-pairing-support",
      flag_descriptions::kWebBluetoothConfirmPairingSupportName,

diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
@@ -445,11 +445,6 @@
     "owners": [ "siashah", "yiian" ],
     "expiry_milestone": 113
   },
-  {
-    "name": "autofill-enable-get-details-for-enroll-parsing-in-upload-card-response",
-    "owners": [ "vinnypersky@google.com", "siyua" ],
-    "expiry_milestone": 110
-  },
   {
     "name": "autofill-enable-manual-fallback-for-virtual-cards",
     "owners": [ "siashah", "siyua" ],

diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
@@ -327,17 +327,6 @@ const char kAutofillAutoTriggerManualFallbackForCardsDescription[] =
     "When enabled, manual fallback will be auto-triggered on form interaction "
     "in the case where autofill failed to fill a credit card form accurately.";
 
-const char kAutofillEnableGetDetailsForEnrollParsingInUploadCardResponseName[] =
-    "Enable parsing of the GetDetailsForEnrollResponseDetails in the "
-    "UploadCardResponseDetails";
-const char
-    kAutofillEnableGetDetailsForEnrollParsingInUploadCardResponseDescription[] =
-        "When enabled, the GetDetailsForEnrollResponseDetails in the "
-        "UploadCardResponseDetails will be parsed, which will allow the "
-        "Virtual Card Enrollment flow to skip making a new GetDetailsForEnroll "
-        "request. This is an optimization to improve the latency of the "
-        "Virtual Card Enrollment flow.";
-
 const char kAutofillEnableFIDOProgressDialogName[] =
     "Show FIDO progress dialog on Android";
 const char kAutofillEnableFIDOProgressDialogDescription[] =

diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
@@ -192,11 +192,6 @@ extern const char kAutofillAlwaysReturnCloudTokenizedCardDescription[];
 extern const char kAutofillAutoTriggerManualFallbackForCardsName[];
 extern const char kAutofillAutoTriggerManualFallbackForCardsDescription[];
 
-extern const char
-    kAutofillEnableGetDetailsForEnrollParsingInUploadCardResponseName[];
-extern const char
-    kAutofillEnableGetDetailsForEnrollParsingInUploadCardResponseDescription[];
-
 extern const char kAutofillEnableFIDOProgressDialogName[];
 extern const char kAutofillEnableFIDOProgressDialogDescription[];
 

diff --git a/components/autofill/core/browser/payments/payments_client_unittest.cc b/components/autofill/core/browser/payments/payments_client_unittest.cc
@@ -1458,9 +1458,6 @@ TEST_F(PaymentsClientTest, UploadSuccessVirtualCardEnrollmentStatePresent) {
 
 TEST_F(PaymentsClientTest,
        UploadSuccessGetDetailsForEnrollmentResponseDetailsPresent) {
-  base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitAndEnableFeature(
-      features::kAutofillEnableGetDetailsForEnrollParsingInUploadCardResponse);
   StartUploading(/*include_cvc=*/true);
   IssueOAuthToken();
   ReturnResponse(net::HTTP_OK,

diff --git a/components/autofill/core/browser/payments/payments_requests/upload_card_request.cc b/components/autofill/core/browser/payments/payments_requests/upload_card_request.cc
@@ -152,11 +152,8 @@ void UploadCardRequest::ParseResponse(const base::Value& response) {
       }
     }
 
-    if (base::FeatureList::IsEnabled(
-            features::
-                kAutofillEnableGetDetailsForEnrollParsingInUploadCardResponse) &&
-        upload_card_response_details_.virtual_card_enrollment_state ==
-            CreditCard::VirtualCardEnrollmentState::UNENROLLED_AND_ELIGIBLE) {
+    if (upload_card_response_details_.virtual_card_enrollment_state ==
+        CreditCard::VirtualCardEnrollmentState::UNENROLLED_AND_ELIGIBLE) {
       const auto* virtual_card_enrollment_data =
           virtual_card_metadata->FindKeyOfType("virtual_card_enrollment_data",
                                                base::Value::Type::DICTIONARY);

diff --git a/components/autofill/core/common/autofill_payments_features.cc b/components/autofill/core/common/autofill_payments_features.cc
@@ -67,14 +67,6 @@ BASE_FEATURE(kAutofillEnableCvcForVcnYellowPath,
              "AutofillEnableCvcForVcnYellowPath",
              base::FEATURE_DISABLED_BY_DEFAULT);
 
-// When enabled, the GetDetailsForEnrollResponseDetails in the
-// UploadCardResponseDetails will be parsed, which will allow the Virtual Card
-// Enrollment flow to skip making a new GetDetailsForEnroll request. This is an
-// optimization to improve the latency of the Virtual Card Enrollment flow.
-BASE_FEATURE(kAutofillEnableGetDetailsForEnrollParsingInUploadCardResponse,
-             "AutofillEnableGetDetailsForEnrollParsingInUploadCardResponse",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-
 // When enabled, a progress dialog will display while authenticating with FIDO.
 // TODO(crbug.com/1337380): Clean up kAutofillEnableFIDOProgressDialog when it's
 // fully rolled out.

diff --git a/components/autofill/core/common/autofill_payments_features.h b/components/autofill/core/common/autofill_payments_features.h
@@ -19,8 +19,6 @@ BASE_DECLARE_FEATURE(kAutofillCreditCardAuthentication);
 BASE_DECLARE_FEATURE(kAutofillEnableCardArtImage);
 BASE_DECLARE_FEATURE(kAutofillEnableCardProductName);
 BASE_DECLARE_FEATURE(kAutofillEnableCvcForVcnYellowPath);
-BASE_DECLARE_FEATURE(
-    kAutofillEnableGetDetailsForEnrollParsingInUploadCardResponse);
 BASE_DECLARE_FEATURE(kAutofillEnableFIDOProgressDialog);
 BASE_DECLARE_FEATURE(kAutofillEnableManualFallbackForVirtualCards);
 BASE_DECLARE_FEATURE(kAutofillEnableMerchantOptOutErrorDialog);