PaymentRequest: Rename ContactInfo to PayerInfo.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPayerInfo.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillContact.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPayerInfo.java
similarity index 70%
rename from chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillContact.java
rename to chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPayerInfo.java
index 37c9fd19d7195b4e7820961ef80b5c4d7c8b72a7..1aadd12fadbc74e14ec7673a69bdd8685b5ab714 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillContact.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPayerInfo.java
@@ -12,28 +12,28 @@ import org.chromium.chrome.browser.payments.ui.PaymentOption;
 import javax.annotation.Nullable;
 
 /**
- * The locally stored contact details.
+ * The locally stored payer info details.
  */
-public class AutofillContact extends PaymentOption {
+public class AutofillPayerInfo extends PaymentOption {
     private final AutofillProfile mProfile;
     @Nullable private String mPayerPhone;
     @Nullable private String mPayerEmail;
 
     /**
-     * Builds contact details.
+     * Builds payer info details.
      *
-     * @param profile    The autofill profile where this contact data lives.
+     * @param profile    The autofill profile where this payer info data lives.
      * @param phone      The phone number. If not empty, this will be the primary label.
      * @param email      The email address. If phone is empty, this will be the primary label.
-     * @param isComplete Whether the data in this contact can be sent to the merchant as-is. If
+     * @param isComplete Whether the data in this payer info can be sent to the merchant as-is. If
      *                   false, user needs to add more information here.
      */
-    public AutofillContact(AutofillProfile profile, @Nullable String phone, @Nullable String email,
-            boolean isComplete) {
+    public AutofillPayerInfo(AutofillProfile profile, @Nullable String phone,
+            @Nullable String email, boolean isComplete) {
         super(profile.getGUID(), null, null, PaymentOption.NO_ICON);
         mProfile = profile;
         mIsComplete = isComplete;
-        setGuidPhoneEmail(profile.getGUID(), phone, email);
+        setPayerInfo(profile.getGUID(), phone, email);
     }
 
     /** @return Email address. Null if the merchant did not request it or data is incomplete. */
@@ -46,26 +46,26 @@ public class AutofillContact extends PaymentOption {
         return mPayerPhone;
     }
 
-    /** @return The autofill profile where this contact data lives. */
+    /** @return The autofill profile where this payer info data lives. */
     public AutofillProfile getProfile() {
         return mProfile;
     }
 
     /**
      * Updates the profile guid, email address, and phone number and marks this information
-     * "complete." Called after the user has edited this contact information. Updates the
+     * "complete." Called after the user has edited this payer info information. Updates the
      * identifier, label, and sublabel.
      *
      * @param guid  The new identifier to use. Should not be null or empty.
      * @param phone The new phone number to use. If not empty, this will be the primary label.
      * @param email The new email address to use. If phone is empty, this will be the primary label.
      */
-    public void completeContact(String guid, @Nullable String phone, @Nullable String email) {
+    public void completePayerInfo(String guid, @Nullable String phone, @Nullable String email) {
         mIsComplete = true;
-        setGuidPhoneEmail(guid, phone, email);
+        setPayerInfo(guid, phone, email);
     }
 
-    private void setGuidPhoneEmail(String guid, @Nullable String phone, @Nullable String email) {
+    private void setPayerInfo(String guid, @Nullable String phone, @Nullable String email) {
         mPayerPhone = TextUtils.isEmpty(phone) ? null : phone;
         mPayerEmail = TextUtils.isEmpty(email) ? null : email;
         updateIdentifierAndLabels(guid, mPayerPhone == null ? mPayerEmail : mPayerPhone,