Rename card 'type' into 'issuer network.'

components/autofill/core/browser/validation.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/validation.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 33 matching lines @@
 
 bool IsValidCreditCardNumber(const base::string16& text) {
   base::string16 number = CreditCard::StripSeparators(text);
 
   // Credit card numbers are at most 19 digits in length [1]. 12 digits seems to
   // be a fairly safe lower-bound [2].  Specific card issuers have more rigidly
   // defined sizes.
   // [1] http://www.merriampark.com/anatomycc.htm
   // [2] http://en.wikipedia.org/wiki/Bank_card_number
   // CardEditor.isCardNumberLengthMaxium() needs to be kept in sync.
-  const char* const type = CreditCard::GetCreditCardType(text);
+  const char* const type = CreditCard::GetCardNetwork(text);
   if (type == kAmericanExpressCard && number.size() != 15)
     return false;
   if (type == kDinersCard && number.size() != 14)
     return false;
   if (type == kDiscoverCard && number.size() != 16)
     return false;
   if (type == kJCBCard && number.size() != 16)
     return false;
   if (type == kMasterCard && number.size() != 16)
     return false;
@@ skipping 35 matching lines @@
          base::ContainsOnlyChars(code, base::ASCIIToUTF16("0123456789"));
 }
 
 bool IsValidCreditCardNumberForBasicCardNetworks(
     const base::string16& text,
     const std::set<std::string>& supported_basic_card_networks,
     base::string16* error_message) {
   DCHECK(error_message);
 
   // The type check is cheaper than the credit card number check.
-  const std::string basic_card_payment_type =
+  const std::string basic_card_issuer_network =
       autofill::data_util::GetPaymentRequestData(
-          CreditCard::GetCreditCardType(text))
-          .basic_card_payment_type;
-  if (!supported_basic_card_networks.count(basic_card_payment_type)) {
+          CreditCard::GetCardNetwork(text))
+          .basic_card_issuer_network;
+  if (!supported_basic_card_networks.count(basic_card_issuer_network)) {
     *error_message = l10n_util::GetStringUTF16(
         IDS_PAYMENTS_VALIDATION_UNSUPPORTED_CREDIT_CARD_TYPE);
     return false;
   }
 
   if (IsValidCreditCardNumber(text))
     return true;
 
   *error_message = l10n_util::GetStringUTF16(
       IDS_PAYMENTS_CARD_NUMBER_INVALID_VALIDATION_MESSAGE);
@@ skipping 240 matching lines @@
     return AMEX_CVC_LENGTH;
 
   return GENERAL_CVC_LENGTH;
 }
 
 bool IsUPIVirtualPaymentAddress(const base::string16& value) {
   return MatchesPattern(value, base::ASCIIToUTF16(kUPIVirtualPaymentAddressRe));
 }
 
 }  // namespace autofill