Rename card 'type' into 'issuer network.'

components/autofill/core/browser/autofill_data_util.cc

 // Copyright 2016 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/autofill_data_util.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/i18n/char_iterator.h"
+#include "base/strings/string_piece.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/grit/components_scaled_resources.h"
 #include "components/strings/grit/components_strings.h"
 #include "third_party/icu/source/common/unicode/uscript.h"
 #include "third_party/re2/src/re2/re2.h"
 
 namespace autofill {
@@ skipping 98 matching lines @@
     }
     name_tokens->pop_back();
   }
 }
 
 // Find whether |name| starts with any of the strings from the array
 // |prefixes|. The returned value is the length of the prefix found, or 0 if
 // none is found.
 size_t StartsWithAny(base::StringPiece16 name, const char** prefixes,
                      size_t prefix_count) {
-   base::string16 buffer;
-   for (size_t i = 0; i < prefix_count; i++) {
-     buffer.clear();
-     base::UTF8ToUTF16(prefixes[i], strlen(prefixes[i]), &buffer);
-     if (base::StartsWith(name, buffer, base::CompareCase::SENSITIVE)) {
-       return buffer.size();
-     }
-   }
-   return 0;
+  base::string16 buffer;
+  for (size_t i = 0; i < prefix_count; i++) {
+    buffer.clear();
+    base::UTF8ToUTF16(prefixes[i], strlen(prefixes[i]), &buffer);
+    if (base::StartsWith(name, buffer, base::CompareCase::SENSITIVE)) {
+      return buffer.size();
+    }
+  }
+  return 0;
 }
 
 // Returns true if |c| is a CJK (Chinese, Japanese, Korean) character, for any
 // of the CJK alphabets.
 bool IsCJKCharacter(UChar32 c) {
   UErrorCode error = U_ZERO_ERROR;
   switch (uscript_getScript(c, &error)) {
     case USCRIPT_HAN:  // CJK logographs, used by all 3 (but rarely for Korean)
     case USCRIPT_HANGUL:    // Korean alphabet
     case USCRIPT_KATAKANA:  // A Japanese syllabary
@@ skipping 251 matching lines @@
   // LastFirst
   candidate = profile.GetRawInfo(autofill::NAME_LAST) +
               profile.GetRawInfo(autofill::NAME_FIRST);
   if (!full_name.compare(candidate)) {
     return true;
   }
 
   return false;
 }
 
-const PaymentRequestData& GetPaymentRequestData(const std::string& type) {
+const PaymentRequestData& GetPaymentRequestData(
+    const std::string& issuer_network) {
   for (const PaymentRequestData& data : kPaymentRequestData) {
-    if (type == data.card_type)
+    if (issuer_network == data.issuer_network)
       return data;
   }
   return kGenericPaymentRequestData;
 }
 
-const char* GetCardTypeForBasicCardPaymentType(
-    const std::string& basic_card_payment_type) {
+const char* GetIssuerNetworkForBasicCardIssuerNetwork(
+    const std::string& basic_card_issuer_network) {
   for (const PaymentRequestData& data : kPaymentRequestData) {
-    if (basic_card_payment_type == data.basic_card_payment_type) {
-      return data.card_type;
+    if (basic_card_issuer_network == data.basic_card_issuer_network) {
+      return data.issuer_network;
     }
   }
-  return kGenericPaymentRequestData.card_type;
+  return kGenericPaymentRequestData.issuer_network;
 }
 
 bool IsValidCountryCode(const std::string& country_code) {
   if (country_code.size() != 2)
     return false;
 
   return re2::RE2::FullMatch(country_code, "^[A-Z]{2}$");
 }
 
 bool IsValidCountryCode(const base::string16& country_code) {
   return IsValidCountryCode(base::UTF16ToUTF8(country_code));
 }
 
 }  // namespace data_util
 }  // namespace autofill