[Reland] Make PaymentOption store a Drawable instead of id

chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillAddress.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 23 matching lines @@
     private AutofillProfile mProfile;
     @Nullable private Pattern mLanguageScriptCodePattern;
 
     /**
      * Builds the autofill address.
      *
      * @param profile The autofill profile containing the address information.
      */
     public AutofillAddress(AutofillProfile profile, boolean isComplete) {
         super(profile.getGUID(), profile.getFullName(), profile.getLabel(),
-                profile.getPhoneNumber(), PaymentOption.NO_ICON);
+                profile.getPhoneNumber(), null);
         mProfile = profile;
         mIsComplete = isComplete;
     }
 
     /** @return The autofill profile where this address data lives. */
     public AutofillProfile getProfile() {
         return mProfile;
     }
 
     /**
@@ skipping 48 matching lines @@
             result.scriptCode = ensureNotNull(matcher.group(SCRIPT_CODE_GROUP));
         }
 
         return result;
     }
 
     private static String ensureNotNull(@Nullable String value) {
         return value == null ? "" : value;
     }
 }