Add billing address to credit cards.

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 504 matching lines @@
     return;
 
   record_type_ = credit_card.record_type_;
   number_ = credit_card.number_;
   name_on_card_ = credit_card.name_on_card_;
   type_ = credit_card.type_;
   expiration_month_ = credit_card.expiration_month_;
   expiration_year_ = credit_card.expiration_year_;
   server_id_ = credit_card.server_id_;
   server_status_ = credit_card.server_status_;
+  billing_address_id_ = credit_card.billing_address_id_;
 
   set_guid(credit_card.guid());
   set_origin(credit_card.origin());
 }
 
 bool CreditCard::UpdateFromImportedCard(const CreditCard& imported_card,
                                         const std::string& app_locale) {
   if (this->GetInfo(AutofillType(CREDIT_CARD_NUMBER), app_locale) !=
           imported_card.GetInfo(AutofillType(CREDIT_CARD_NUMBER), app_locale)) {
     return false;
@@ skipping 43 matching lines @@
     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;
 
+  comparison = billing_address_id_.compare(credit_card.billing_address_id_);
+  if (comparison != 0)
+    return comparison;
+
   if (static_cast<int>(server_status_) <
       static_cast<int>(credit_card.server_status_))
     return -1;
   if (static_cast<int>(server_status_) >
       static_cast<int>(credit_card.server_status_))
     return 1;
   if (static_cast<int>(record_type_) <
       static_cast<int>(credit_card.record_type_))
     return -1;
   if (static_cast<int>(record_type_) >
@@ skipping 215 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