[Merge M-53] Credit card editor for PaymentRequest UI.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillAddress.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillAddress.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillAddress.java
index 5e390249b8d8e644d5124ea1fa9cc3a3a5ec87b2..391a525f8b45341985de3ddaa836966e519ddc7c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillAddress.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillAddress.java
@@ -52,15 +52,14 @@ public class AutofillAddress extends PaymentOption {
 
     /**
      * Updates the address and marks it "complete." Called after the user has edited this address.
-     * Updates the label and sublabel.
+     * Updates the identifier, label, and sublabel.
      *
-     * @param profile The new profile to use. The GUID should not change.
+     * @param profile The new profile to use.
      */
     public void completeAddress(AutofillProfile profile) {
-        assert profile.getGUID().equals(mProfile.getGUID());
         mProfile = profile;
         mIsComplete = true;
-        updateLabels(mProfile.getFullName(), mProfile.getLabel());
+        updateIdentifierAndLabels(mProfile.getGUID(), mProfile.getFullName(), mProfile.getLabel());
     }
 
     /** @return The country code to use, e.g., when constructing an editor for this address. */