Add billing address as a mandatory field of Payments 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 660 matching lines @@
 
 bool CreditCard::IsLocalDuplicateOfServerCard(const CreditCard& other) const {
   if (record_type() != LOCAL_CARD || other.record_type() == LOCAL_CARD)
     return false;
 
   // If |this| is only a partial card, i.e. some fields are missing, assume
   // those fields match.
   if ((!name_on_card_.empty() && name_on_card_ != other.name_on_card_) ||
       (expiration_month_ != 0 &&
        expiration_month_ != other.expiration_month_) ||
-      (expiration_year_ != 0 && expiration_year_ != other.expiration_year_)) {
+      (expiration_year_ != 0 && expiration_year_ != other.expiration_year_) ||
+      (!billing_address_id_.empty() &&
+       billing_address_id_ != other.billing_address_id_)) {
     return false;
   }
 
   if (number_.empty())
     return true;
 
   return HasSameNumberAs(other);
 }
 
 bool CreditCard::HasSameNumberAs(const CreditCard& other) const {
@@ skipping 238 matching lines @@
 const char kDinersCard[] = "dinersCC";
 const char kDiscoverCard[] = "discoverCC";
 const char kGenericCard[] = "genericCC";
 const char kJCBCard[] = "jcbCC";
 const char kMasterCard[] = "masterCardCC";
 const char kMirCard[] = "mirCC";
 const char kUnionPay[] = "unionPayCC";
 const char kVisaCard[] = "visaCC";
 
 }  // namespace autofill