Rename card 'type' into 'issuer network.'

components/autofill/core/browser/personal_data_manager.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/autofill/core/browser/personal_data_manager.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <list>
@@ skipping 1607 matching lines @@
     bool prefix_matched_suggestion;
     if (IsValidSuggestionForFieldContents(
             creditcard_field_lower, field_contents_lower, type,
             credit_card->record_type() == CreditCard::MASKED_SERVER_CARD,
             &prefix_matched_suggestion)) {
       // Make a new suggestion.
       suggestions.push_back(Suggestion());
       Suggestion* suggestion = &suggestions.back();
 
       suggestion->value = credit_card->GetInfo(type, app_locale_);
-      suggestion->icon = base::UTF8ToUTF16(credit_card->type());
+      suggestion->icon = base::UTF8ToUTF16(credit_card->network());
       suggestion->backend_id = credit_card->guid();
       suggestion->match = prefix_matched_suggestion
                               ? Suggestion::PREFIX_MATCH
                               : Suggestion::SUBSTRING_MATCH;
 
       // If the value is the card number, the label is the expiration date.
       // Otherwise the label is the card number, or if that is empty the
       // cardholder name. The label should never repeat the value.
       if (type.GetStorableType() == CREDIT_CARD_NUMBER) {
-        suggestion->value = credit_card->TypeAndLastFourDigits();
+        suggestion->value = credit_card->NetworkAndLastFourDigits();
         if (IsAutofillCreditCardLastUsedDateDisplayExperimentEnabled()) {
           suggestion->label =
               credit_card->GetLastUsedDateForDisplay(app_locale_);
         } else {
           suggestion->label = credit_card->GetInfo(
               AutofillType(CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR), app_locale_);
         }
         if (IsAutofillCreditCardPopupLayoutExperimentEnabled())
           ModifyAutofillCreditCardSuggestion(suggestion);
       } else if (credit_card->number().empty()) {
         if (type.GetStorableType() != CREDIT_CARD_NAME_FULL) {
           suggestion->label = credit_card->GetInfo(
               AutofillType(CREDIT_CARD_NAME_FULL), app_locale_);
         }
       } else {
 #if defined(OS_ANDROID)
         // Since Android places the label on its own row, there's more
         // horizontal
         // space to work with. Show "Amex - 1234" rather than desktop's "*1234".
-        suggestion->label = credit_card->TypeAndLastFourDigits();
+        suggestion->label = credit_card->NetworkAndLastFourDigits();
 #else
         suggestion->label = base::ASCIIToUTF16("*");
         suggestion->label.append(credit_card->LastFourDigits());
 #endif
       }
     }
   }
 
   // Prefix matches should precede other token matches.
   if (IsFeatureSubstringMatchEnabled()) {
@@ skipping 368 matching lines @@
       existing_profiles->back().SetRawInfo(EMAIL_ADDRESS, email);
 
     AutofillMetrics::LogWalletAddressConversionType(
         AutofillMetrics::CONVERTED_ADDRESS_ADDED);
   }
 
   return guid;
 }
 
 }  // namespace autofill