[Nickname Management] Remove feature switch in Bling codebase

Feature is 100% in Stable. Remove branch logic in Bling. Desktop and
Clank will follow.

Bug: 1082013
Change-Id: If2523c34dc2bf1acd1adb0b69910a093d5db2e34
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2601042Reviewed-by: Jared Saul <jsaul@google.com>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Siyu An <siyua@chromium.org>
Cr-Commit-Position: refs/heads/master@{#842139}

ios/chrome/browser/flags/about_flags.mm

@@ -455,12 +455,6 @@ const flags_ui::FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kAutofillEnableGoogleIssuedCardDescription,
      flags_ui::kOsIos,
      FEATURE_VALUE_TYPE(autofill::features::kAutofillEnableGoogleIssuedCard)},
-    {"autofill-enable-card-nickname-management",
-     flag_descriptions::kAutofillEnableCardNicknameManagementName,
-     flag_descriptions::kAutofillEnableCardNicknameManagementDescription,
-     flags_ui::kOsIos,
-     FEATURE_VALUE_TYPE(
-         autofill::features::kAutofillEnableCardNicknameManagement)},
     {"enable-ios-managed-settings-ui",
      flag_descriptions::kEnableIOSManagedSettingsUIName,
      flag_descriptions::kEnableIOSManagedSettingsUIDescription,
@@ -476,12 +470,6 @@ const flags_ui::FeatureEntry kFeatureEntries[] = {
     {"refactored-ntp", flag_descriptions::kRefactoredNTPName,
      flag_descriptions::kRefactoredNTPDescription, flags_ui::kOsIos,
      FEATURE_VALUE_TYPE(kRefactoredNTP)},
-    {"autofill-enable-card-nickname-upstream",
-     flag_descriptions::kAutofillEnableCardNicknameUpstreamName,
-     flag_descriptions::kAutofillEnableCardNicknameUpstreamDescription,
-     flags_ui::kOsIos,
-     FEATURE_VALUE_TYPE(
-         autofill::features::kAutofillEnableCardNicknameUpstream)},
     {"illustrated-empty-states", flag_descriptions::kIllustratedEmptyStatesName,
      flag_descriptions::kIllustratedEmptyStatesDescription, flags_ui::kOsIos,
      FEATURE_VALUE_TYPE(kIllustratedEmptyStates)},

ios/chrome/browser/flags/ios_chrome_flag_descriptions.cc

@@ -23,18 +23,6 @@ const char kAutofillCreditCardUploadDescription[] =
     "Offers uploading Autofilled credit cards to Google Payments after form "
     "submission.";
 
-const char kAutofillEnableCardNicknameManagementName[] =
-    "Enable Autofill card nickname management";
-const char kAutofillEnableCardNicknameManagementDescription[] =
-    "When enabled, nicknames for credit cards will be able to be modified "
-    "locally.";
-
-const char kAutofillEnableCardNicknameUpstreamName[] =
-    "Enable Autofill card nickname upstream";
-const char kAutofillEnableCardNicknameUpstreamDescription[] =
-    "When enabled, nicknames for credit cards will be able to be uploaded to "
-    "Payments.";
-
 const char kAutofillEnableGoogleIssuedCardName[] =
     "Enable Autofill Google-issued card";
 const char kAutofillEnableGoogleIssuedCardDescription[] =

ios/chrome/browser/flags/ios_chrome_flag_descriptions.h

@@ -19,14 +19,6 @@ extern const char kAutofillCacheQueryResponsesDescription[];
 extern const char kAutofillCreditCardUploadName[];
 extern const char kAutofillCreditCardUploadDescription[];
 
-// Title and description for the flag to control card nickname management.
-extern const char kAutofillEnableCardNicknameManagementName[];
-extern const char kAutofillEnableCardNicknameManagementDescription[];
-
-// Title and description for the flag to control card nickname upstream.
-extern const char kAutofillEnableCardNicknameUpstreamName[];
-extern const char kAutofillEnableCardNicknameUpstreamDescription[];
-
 // Title and description for the flag to control enabling Google-issued cards in
 // autofill suggestions.
 extern const char kAutofillEnableGoogleIssuedCardName[];

ios/chrome/browser/ui/settings/autofill/autofill_add_credit_card_egtest.mm

@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "base/ios/ios_util.h"
-#import "components/autofill/core/common/autofill_payments_features.h"
 #import "ios/chrome/browser/ui/autofill/autofill_app_interface.h"
 #include "ios/chrome/grit/ios_strings.h"
 #import "ios/chrome/test/earl_grey/chrome_earl_grey.h"
@@ -97,8 +96,7 @@ id<GREYMatcher> CardNumberIconView(NSString* icon_type) {
 
 - (AppLaunchConfiguration)appConfigurationForTestCase {
   AppLaunchConfiguration config;
-  config.features_enabled.push_back(
-      autofill::features::kAutofillEnableCardNicknameManagement);
+  // Add feature configs here.
   return config;
 }
 

ios/chrome/browser/ui/settings/autofill/autofill_add_credit_card_mediator.mm

@@ -75,8 +75,7 @@
     return;
   }
 
-  if ([self isCardNicknameManagementEnabled] &&
-      !autofill::CreditCard::IsNicknameValid(
+  if (!autofill::CreditCard::IsNicknameValid(
           base::SysNSStringToUTF16(cardNickname))) {
     [self.addCreditCardMediatorDelegate
         creditCardMediatorHasInvalidNickname:self];
@@ -237,18 +236,8 @@
 
 // Checks if a credit card has a valid |nickname|.
 - (BOOL)isValidCardNickname:(NSString*)cardNickname {
-  if ([self isCardNicknameManagementEnabled]) {
-    return autofill::CreditCard::IsNicknameValid(
-        base::SysNSStringToUTF16(cardNickname));
-  }
-
-  return YES;
-}
-
-// Returns whether card nickname managment feature is enabled.
-- (BOOL)isCardNicknameManagementEnabled {
-  return base::FeatureList::IsEnabled(
-      autofill::features::kAutofillEnableCardNicknameManagement);
+  return autofill::CreditCard::IsNicknameValid(
+      base::SysNSStringToUTF16(cardNickname));
 }
 
 @end

ios/chrome/browser/ui/settings/autofill/autofill_add_credit_card_mediator_unittest.mm

@@ -7,7 +7,6 @@
 #include "base/strings/sys_string_conversions.h"
 #include "base/test/scoped_feature_list.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
-#include "components/autofill/core/common/autofill_payments_features.h"
 #include "ios/chrome/browser/autofill/personal_data_manager_factory.h"
 #include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
 #import "ios/chrome/browser/ui/settings/autofill/autofill_add_credit_card_mediator_delegate.h"
@@ -136,10 +135,6 @@ TEST_F(AutofillAddCreditCardMediatorTest, TestSavingCreditCardWithInvalidYear) {
 // Test saving a credit card with invalid nickname.
 TEST_F(AutofillAddCreditCardMediatorTest,
        TestSavingCreditCardWithInvalidNickname) {
-  // Restrict formless forms to checkout flows.
-  base::test::ScopedFeatureList feature_list;
-  feature_list.InitAndEnableFeature(
-      autofill::features::kAutofillEnableCardNicknameManagement);
   PersonalDataManagerFinishedProfileTasksWaiter waiter(personal_data_manager_);
 
   // |creditCardMediatorHasInvalidExpirationDate| expected to be called by

ios/chrome/browser/ui/settings/autofill/autofill_add_credit_card_view_controller.mm

@@ -7,7 +7,6 @@
 #include "base/feature_list.h"
 #include "base/mac/foundation_util.h"
 #include "base/metrics/user_metrics.h"
-#include "components/autofill/core/common/autofill_payments_features.h"
 #import "ios/chrome/browser/ui/autofill/cells/autofill_edit_item.h"
 #import "ios/chrome/browser/ui/settings/autofill/autofill_add_credit_card_view_controller_delegate.h"
 #import "ios/chrome/browser/ui/table_view/cells/table_view_text_edit_item.h"
@@ -119,11 +118,8 @@ typedef NS_ENUM(NSInteger, ItemType) {
   [self updateCreditCardData];
 
   BOOL hasUserInput = self.cardHolderName.length || self.cardNumber.length ||
-                      self.expirationMonth.length || self.expirationYear.length;
-
-  if ([self isCardNicknameManagementEnabled]) {
-    hasUserInput = hasUserInput || self.cardNickname.length;
-  }
+                      self.expirationMonth.length ||
+                      self.expirationYear.length || self.cardNickname.length;
 
   return hasUserInput;
 }
@@ -139,30 +135,17 @@ typedef NS_ENUM(NSInteger, ItemType) {
   AutofillEditItem* expirationMonthItem = [self expirationMonthItem];
   AutofillEditItem* expirationYearItem = [self expirationYearItem];
 
-  if ([self isCardNicknameManagementEnabled]) {
-    [model addSectionWithIdentifier:SectionIdentifierCreditCardDetails];
-    [model addItem:cardNumberItem
-        toSectionWithIdentifier:SectionIdentifierCreditCardDetails];
-    [model addItem:expirationMonthItem
-        toSectionWithIdentifier:SectionIdentifierCreditCardDetails];
-    [model addItem:expirationYearItem
-        toSectionWithIdentifier:SectionIdentifierCreditCardDetails];
-    [model addItem:cardHolderNameItem
-        toSectionWithIdentifier:SectionIdentifierCreditCardDetails];
-    [model addItem:[self cardNicknameItem]
-        toSectionWithIdentifier:SectionIdentifierCreditCardDetails];
-  } else {
-    [model addSectionWithIdentifier:SectionIdentifierName];
-    [model addItem:cardHolderNameItem
-        toSectionWithIdentifier:SectionIdentifierName];
-    [model addSectionWithIdentifier:SectionIdentifierCreditCardDetails];
-    [model addItem:cardNumberItem
-        toSectionWithIdentifier:SectionIdentifierCreditCardDetails];
-    [model addItem:expirationMonthItem
-        toSectionWithIdentifier:SectionIdentifierCreditCardDetails];
-    [model addItem:expirationYearItem
-        toSectionWithIdentifier:SectionIdentifierCreditCardDetails];
-  }
+  [model addSectionWithIdentifier:SectionIdentifierCreditCardDetails];
+  [model addItem:cardNumberItem
+      toSectionWithIdentifier:SectionIdentifierCreditCardDetails];
+  [model addItem:expirationMonthItem
+      toSectionWithIdentifier:SectionIdentifierCreditCardDetails];
+  [model addItem:expirationYearItem
+      toSectionWithIdentifier:SectionIdentifierCreditCardDetails];
+  [model addItem:cardHolderNameItem
+      toSectionWithIdentifier:SectionIdentifierCreditCardDetails];
+  [model addItem:[self cardNicknameItem]
+      toSectionWithIdentifier:SectionIdentifierCreditCardDetails];
 }
 
 #pragma mark - TableViewTextEditItemDelegate
@@ -264,13 +247,9 @@ typedef NS_ENUM(NSInteger, ItemType) {
 
 // Updates credit card data properties with the text in TableView cells.
 - (void)updateCreditCardData {
-  // TODO: Remove section handling when flag is default and cleaned up.
-  NSInteger cardHolderNameSection = [self isCardNicknameManagementEnabled]
-                                        ? SectionIdentifierCreditCardDetails
-                                        : SectionIdentifierName;
-
-  self.cardHolderName = [self readTextFromItemtype:ItemTypeName
-                                 sectionIdentifier:cardHolderNameSection];
+  self.cardHolderName =
+      [self readTextFromItemtype:ItemTypeName
+               sectionIdentifier:SectionIdentifierCreditCardDetails];
 
   self.cardNumber =
       [self readTextFromItemtype:ItemTypeCardNumber
@@ -284,11 +263,9 @@ typedef NS_ENUM(NSInteger, ItemType) {
       [self readTextFromItemtype:ItemTypeExpirationYear
                sectionIdentifier:SectionIdentifierCreditCardDetails];
 
-  if ([self isCardNicknameManagementEnabled]) {
-    self.cardNickname =
-        [self readTextFromItemtype:ItemTypeCardNickname
-                 sectionIdentifier:SectionIdentifierCreditCardDetails];
-  }
+  self.cardNickname =
+      [self readTextFromItemtype:ItemTypeCardNickname
+               sectionIdentifier:SectionIdentifierCreditCardDetails];
 }
 
 // Reads and returns the data from the item with passed |itemType| and
@@ -413,10 +390,4 @@ typedef NS_ENUM(NSInteger, ItemType) {
   return cardNicknameItem;
 }
 
-// Returns whether card nickname managment feature is enabled.
-- (BOOL)isCardNicknameManagementEnabled {
-  return base::FeatureList::IsEnabled(
-      autofill::features::kAutofillEnableCardNicknameManagement);
-}
-
 @end

ios/chrome/browser/ui/settings/autofill/autofill_credit_card_edit_table_view_controller.mm

@@ -159,23 +159,13 @@ typedef NS_ENUM(NSInteger, ItemType) {
 
   BOOL isEditing = self.tableView.editing;
 
-  NSArray<AutofillEditItem*>* editItems;
-  if ([self isCardNicknameManagementEnabled]) {
-    editItems = @[
-      [self cardNumberItem:isEditing],
-      [self expirationMonthItem:isEditing],
-      [self expirationYearItem:isEditing],
-      [self cardholderNameItem:isEditing],
-      [self nicknameItem:isEditing],
-    ];
-  } else {
-    editItems = @[
-      [self cardholderNameItem:isEditing],
-      [self cardNumberItem:isEditing],
-      [self expirationMonthItem:isEditing],
-      [self expirationYearItem:isEditing],
-    ];
-  }
+  NSArray<AutofillEditItem*>* editItems = @[
+    [self cardNumberItem:isEditing],
+    [self expirationMonthItem:isEditing],
+    [self expirationYearItem:isEditing],
+    [self cardholderNameItem:isEditing],
+    [self nicknameItem:isEditing],
+  ];
 
   [model addSectionWithIdentifier:SectionIdentifierFields];
   for (AutofillEditItem* item in editItems) {
@@ -406,10 +396,4 @@ typedef NS_ENUM(NSInteger, ItemType) {
   return nicknameItem;
 }
 
-// Returns whether card nickname managment feature is enabled.
-- (BOOL)isCardNicknameManagementEnabled {
-  return base::FeatureList::IsEnabled(
-      autofill::features::kAutofillEnableCardNicknameManagement);
-}
-
 @end

ios/chrome/browser/ui/settings/autofill/autofill_edit_credit_card_egtest.mm

@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "base/ios/ios_util.h"
-#import "components/autofill/core/common/autofill_payments_features.h"
 #include "components/strings/grit/components_strings.h"
 #import "ios/chrome/browser/ui/autofill/autofill_app_interface.h"
 #include "ios/chrome/grit/ios_strings.h"
@@ -56,8 +55,7 @@ id<GREYAction> ScrollDown() {
 
 - (AppLaunchConfiguration)appConfigurationForTestCase {
   AppLaunchConfiguration config;
-  config.features_enabled.push_back(
-      autofill::features::kAutofillEnableCardNicknameManagement);
+  // Add feature configs here.
   return config;
 }