[Autofill] Disambiguate similar types before uploading.

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>
@@ skipping 623 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_FULL);
+  supported_types->insert(CREDIT_CARD_NAME_FIRST);
+  supported_types->insert(CREDIT_CARD_NAME_LAST);
   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 134 matching lines @@
 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