Revert of Make PaymentOption store a Drawable instead of id

chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillContact.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.text.TextUtils;
 
 import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
 import org.chromium.chrome.browser.payments.ui.PaymentOption;
@@ skipping 12 matching lines @@
      * Builds contact details.
      *
      * @param profile    The autofill profile where this contact 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
      *                   false, user needs to add more information here.
      */
     public AutofillContact(AutofillProfile profile, @Nullable String phone, @Nullable String email,
             boolean isComplete) {
-        super(profile.getGUID(), null, null, null);
+        super(profile.getGUID(), null, null, PaymentOption.NO_ICON);
         mProfile = profile;
         mIsComplete = isComplete;
         setGuidPhoneEmail(profile.getGUID(), phone, email);
     }
 
     /** @return Email address. Null if the merchant did not request it or data is incomplete. */
     @Nullable public String getPayerEmail() {
         return mPayerEmail;
     }
 
@@ skipping 21 matching lines @@
         setGuidPhoneEmail(guid, phone, email);
     }
 
     private void setGuidPhoneEmail(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,
                 mPayerPhone == null ? null : mPayerEmail);
     }
 }