[Payments] Dedupe contact info, and phone and email editor suggestions.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/AddressEditor.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/AddressEditor.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/AddressEditor.java
index 57b69e173e2dbfcc75ed93a2b536c285f5934d4e..e895591f636ae9ef68bdc462639e41709608af2d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/AddressEditor.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/AddressEditor.java
@@ -20,7 +20,6 @@ import org.chromium.chrome.browser.preferences.autofill.AutofillProfileBridge;
 import org.chromium.chrome.browser.preferences.autofill.AutofillProfileBridge.AddressField;
 import org.chromium.chrome.browser.preferences.autofill.AutofillProfileBridge.AddressUiComponent;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -34,9 +33,9 @@ import javax.annotation.Nullable;
  * An address editor. Can be used for either shipping or billing address editing.
  */
 public class AddressEditor extends EditorBase<AutofillAddress> {
-    private final Handler mHandler;
-    private final Map<Integer, EditorFieldModel> mAddressFields;
-    private final List<CharSequence> mPhoneNumbers;
+    private final Handler mHandler = new Handler();
+    private final Map<Integer, EditorFieldModel> mAddressFields = new HashMap<>();
+    private final Set<CharSequence> mPhoneNumbers = new HashSet<>();
     @Nullable private AutofillProfileBridge mAutofillProfileBridge;
     @Nullable private EditorFieldModel mCountryField;
     @Nullable private EditorFieldModel mPhoneField;
@@ -44,15 +43,6 @@ public class AddressEditor extends EditorBase<AutofillAddress> {
     @Nullable private List<AddressUiComponent> mAddressUiComponents;
 
     /**
-     * Builds an address editor.
-     */
-    public AddressEditor() {
-        mHandler = new Handler();
-        mAddressFields = new HashMap<>();
-        mPhoneNumbers = new ArrayList<>();
-    }
-
-    /**
      * Returns whether the given profile can be sent to the merchant as-is without editing first. If
      * the country code is not set or invalid, but all fields for the default locale's country code
      * are present, then the profile is deemed "complete." AutoflllAddress.toPaymentAddress() will
@@ -78,7 +68,7 @@ public class AddressEditor extends EditorBase<AutofillAddress> {
     }
 
     /**
-     * Adds the given phone number to the autocomplete list, if it's valid.
+     * Adds the given phone number to the autocomplete set, if it's valid.
      *
      * @param phoneNumber The phone number to possibly add.
      */