[Merge M-56] All billing addresses should be valid/complete

chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentApp.java

 // 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.
 
 package org.chromium.chrome.browser.payments;
 
 import android.content.Context;
 import android.os.Handler;
 import android.text.TextUtils;
 
@@ skipping 31 matching lines @@
     public void getInstruments(
             Map<String, PaymentMethodData> unusedMethodData, final InstrumentsCallback callback) {
         PersonalDataManager pdm = PersonalDataManager.getInstance();
         List<CreditCard> cards = pdm.getCreditCardsToSuggest();
         final List<PaymentInstrument> instruments = new ArrayList<>(cards.size());
 
         for (int i = 0; i < cards.size(); i++) {
             CreditCard card = cards.get(i);
             AutofillProfile billingAddress = TextUtils.isEmpty(card.getBillingAddressId())
                     ? null : pdm.getProfile(card.getBillingAddressId());
+
+            if (billingAddress != null
+                    && AutofillAddress.checkAddressCompletionStatus(billingAddress)
+                            != AutofillAddress.COMPLETE) {
+                billingAddress = null;
+            }
+
             instruments.add(new AutofillPaymentInstrument(mContext, mWebContents, card,
                     billingAddress));
         }
 
         new Handler().post(new Runnable() {
             @Override
             public void run() {
                 callback.onInstrumentsReady(AutofillPaymentApp.this, instruments);
             }
         });
@@ skipping 20 matching lines @@
         methods.add("generic");
 
         return methods;
     }
 
     @Override
     public String getAppIdentifier() {
         return "Chrome_Autofill_Payment_App";
     }
 }