Revert of Make PaymentOption store a Drawable instead of id

chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.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.app.Activity;
 import android.graphics.Bitmap;
 import android.os.Handler;
 import android.text.TextUtils;
@@ skipping 216 matching lines @@
                         faviconHelper.destroy();
                         if (bitmap == null) return;
                         if (mUI == null) {
                             mFavicon = bitmap;
                             return;
                         }
                         mUI.setTitleBitmap(bitmap);
                     }
                 });
 
-        mApps = PaymentAppFactory.create(mContext, webContents);
+        mApps = PaymentAppFactory.create(webContents);
 
         mAddressEditor = new AddressEditor();
         mCardEditor = new CardEditor(webContents, mAddressEditor, sObserverForTest);
 
         recordSuccessFunnelHistograms("Initiated");
     }
 
     /**
      * Called by the merchant website to initialize the payment request data.
      */
@@ skipping 399 matching lines @@
                     || !formatter.isValidAmountValue(option.amount.value)) {
                 return null;
             }
         }
 
         List<PaymentOption> result = new ArrayList<>();
         int selectedItemIndex = SectionInformation.NO_SELECTION;
         for (int i = 0; i < options.length; i++) {
             PaymentShippingOption option = options[i];
             result.add(new PaymentOption(option.id, option.label,
-                    formatter.format(option.amount.value), null));
+                    formatter.format(option.amount.value), PaymentOption.NO_ICON));
             if (option.selected) selectedItemIndex = i;
         }
 
         return new SectionInformation(PaymentRequestUI.TYPE_SHIPPING_OPTIONS, selectedItemIndex,
                 result);
     }
 
     /**
      * Called to retrieve the data to show in the initial PaymentRequest UI.
      */
@@ skipping 594 matching lines @@
                 "PaymentRequest.CheckoutFunnel.Aborted", abortReason,
                 PaymentRequestMetrics.ABORT_REASON_MAX);
 
         if (abortReason == PaymentRequestMetrics.ABORT_REASON_ABORTED_BY_USER) {
             mJourneyLogger.recordJourneyStatsHistograms("UserAborted");
         } else {
             mJourneyLogger.recordJourneyStatsHistograms("OtherAborted");
         }
     }
 }