[Autofill] Add credit card first and last name heuristics predictions.

components/autofill/core/browser/credit_card.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/credit_card.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <ostream>
 #include <string>
 
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
+#include "components/autofill/core/browser/autofill_data_util.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/validation.h"
 #include "components/autofill/core/common/autofill_l10n_util.h"
 #include "components/autofill/core/common/autofill_regexes.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "grit/components_scaled_resources.h"
 #include "grit/components_strings.h"
 #include "third_party/icu/source/common/unicode/uloc.h"
 #include "third_party/icu/source/i18n/unicode/dtfmtsym.h"
@@ skipping 222 matching lines @@
 }
 
 CreditCard::ServerStatus CreditCard::GetServerStatus() const {
   DCHECK_NE(LOCAL_CARD, record_type());
   return server_status_;
 }
 
 base::string16 CreditCard::GetRawInfo(ServerFieldType type) const {
   DCHECK_EQ(CREDIT_CARD, AutofillType(type).group());
   switch (type) {
-    case CREDIT_CARD_NAME:
+    case CREDIT_CARD_NAME_FULL:
       return name_on_card_;
 
+    case CREDIT_CARD_NAME_FIRST:
+      return data_util::SplitName(name_on_card_).given;
+
+    case CREDIT_CARD_NAME_LAST:
+      return data_util::SplitName(name_on_card_).family;
+
     case CREDIT_CARD_EXP_MONTH:
       return ExpirationMonthAsString();
 
     case CREDIT_CARD_EXP_2_DIGIT_YEAR:
       return Expiration2DigitYearAsString();
 
     case CREDIT_CARD_EXP_4_DIGIT_YEAR:
       return Expiration4DigitYearAsString();
 
     case CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR: {
@@ skipping 25 matching lines @@
     default:
       // ComputeDataPresentForArray will hit this repeatedly.
       return base::string16();
   }
 }
 
 void CreditCard::SetRawInfo(ServerFieldType type,
                             const base::string16& value) {
   DCHECK_EQ(CREDIT_CARD, AutofillType(type).group());
   switch (type) {
-    case CREDIT_CARD_NAME:
+    case CREDIT_CARD_NAME_FULL:
       name_on_card_ = value;
       break;
 
     case CREDIT_CARD_EXP_MONTH:
       SetExpirationMonthFromString(value, std::string());
       break;
 
     case CREDIT_CARD_EXP_2_DIGIT_YEAR:
       // This is a read-only attribute.
       break;
@@ skipping 219 matching lines @@
   expiration_month_ = imported_card.expiration_month_;
   expiration_year_ = imported_card.expiration_year_;
 
   return true;
 }
 
 int CreditCard::Compare(const CreditCard& credit_card) const {
   // The following CreditCard field types are the only types we store in the
   // WebDB so far, so we're only concerned with matching these types in the
   // credit card.
-  const ServerFieldType types[] = { CREDIT_CARD_NAME,
-                                    CREDIT_CARD_NUMBER,
-                                    CREDIT_CARD_EXP_MONTH,
-                                    CREDIT_CARD_EXP_4_DIGIT_YEAR };
+  const ServerFieldType types[] = {CREDIT_CARD_NAME_FULL, CREDIT_CARD_NUMBER,
+                                   CREDIT_CARD_EXP_MONTH,
+                                   CREDIT_CARD_EXP_4_DIGIT_YEAR};
   for (size_t i = 0; i < arraysize(types); ++i) {
     int comparison =
         GetRawInfo(types[i]).compare(credit_card.GetRawInfo(types[i]));
     if (comparison != 0)
       return comparison;
   }
 
   int comparison = server_id_.compare(credit_card.server_id_);
   if (comparison != 0)
     return comparison;
@@ skipping 57 matching lines @@
          expiration_month_ != 0 &&
          expiration_year_ != 0;
 }
 
 bool CreditCard::IsValid() const {
   return IsValidCreditCardNumber(number_) &&
          IsValidCreditCardExpirationDate(
              expiration_year_, expiration_month_, base::Time::Now());
 }
 
+// TODO(crbug.com/589536): Upload new credit card types to the server.
 void CreditCard::GetSupportedTypes(ServerFieldTypeSet* supported_types) const {
-  supported_types->insert(CREDIT_CARD_NAME);
+  supported_types->insert(CREDIT_CARD_NAME_FULL);
   supported_types->insert(CREDIT_CARD_NUMBER);
   supported_types->insert(CREDIT_CARD_TYPE);
   supported_types->insert(CREDIT_CARD_EXP_MONTH);
   supported_types->insert(CREDIT_CARD_EXP_2_DIGIT_YEAR);
   supported_types->insert(CREDIT_CARD_EXP_4_DIGIT_YEAR);
   supported_types->insert(CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR);
   supported_types->insert(CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR);
 }
 
 base::string16 CreditCard::ExpirationMonthAsString() const {
@@ skipping 108 matching lines @@
       *num = i + 1;  // Adjust from 0-indexed to 1-indexed.
       return true;
     }
   }
 
   return false;
 }
 
 // So we can compare CreditCards with EXPECT_EQ().
 std::ostream& operator<<(std::ostream& os, const CreditCard& credit_card) {
-  return os
-      << base::UTF16ToUTF8(credit_card.Label())
-      << " "
-      << credit_card.guid()
-      << " "
-      << credit_card.origin()
-      << " "
-      << base::UTF16ToUTF8(credit_card.GetRawInfo(CREDIT_CARD_NAME))
-      << " "
-      << base::UTF16ToUTF8(credit_card.GetRawInfo(CREDIT_CARD_TYPE))
-      << " "
-      << base::UTF16ToUTF8(credit_card.GetRawInfo(CREDIT_CARD_NUMBER))
-      << " "
-      << base::UTF16ToUTF8(credit_card.GetRawInfo(CREDIT_CARD_EXP_MONTH))
-      << " "
-      << base::UTF16ToUTF8(
-             credit_card.GetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR));
+  return os << base::UTF16ToUTF8(credit_card.Label()) << " "
+            << credit_card.guid() << " " << credit_card.origin() << " "
+            << base::UTF16ToUTF8(credit_card.GetRawInfo(CREDIT_CARD_NAME_FULL))
+            << " "
+            << base::UTF16ToUTF8(credit_card.GetRawInfo(CREDIT_CARD_TYPE))
+            << " "
+            << base::UTF16ToUTF8(credit_card.GetRawInfo(CREDIT_CARD_NUMBER))
+            << " "
+            << base::UTF16ToUTF8(credit_card.GetRawInfo(CREDIT_CARD_EXP_MONTH))
+            << " " << base::UTF16ToUTF8(
+                          credit_card.GetRawInfo(CREDIT_CARD_EXP_4_DIGIT_YEAR));
 }
 
 // These values must match the values in WebKitPlatformSupportImpl in
 // webkit/glue. We send these strings to WebKit, which then asks
 // WebKitPlatformSupportImpl to load the image data.
 const char kAmericanExpressCard[] = "americanExpressCC";
 const char kDinersCard[] = "dinersCC";
 const char kDiscoverCard[] = "discoverCC";
 const char kGenericCard[] = "genericCC";
 const char kJCBCard[] = "jcbCC";
 const char kMasterCard[] = "masterCardCC";
 const char kUnionPay[] = "unionPayCC";
 const char kVisaCard[] = "visaCC";
 
 }  // namespace autofill