Bug 1114935 - Part 6.4: Migration in Payment. r=ferjmoreno

--HG--
extra : rebase_source : df6d070e61d155e02a0b7d38b4212b77b0a3767b
extra : histedit_source : 0c602e973a87d26a3b9692c39433123220c31a9b

b2g/components/PaymentProviderStrategy.js

@@ -11,9 +11,9 @@ const PREF_DEBUG = "dom.payment.debug";
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-XPCOMUtils.defineLazyServiceGetter(this, "iccProvider",
-                                   "@mozilla.org/ril/content-helper;1",
-                                   "nsIIccProvider");
+XPCOMUtils.defineLazyServiceGetter(this, "gIccService",
+                                   "@mozilla.org/icc/iccservice;1",
+                                   "nsIIccService");
 
 XPCOMUtils.defineLazyServiceGetter(this, "gRil",
                                    "@mozilla.org/ril;1",
@@ -148,7 +148,8 @@ PaymentProviderStrategy.prototype = {
     if (!this._iccInfo) {
       this._iccInfo = [];
       for (let i = 0; i < gRil.numRadioInterfaces; i++) {
-        let info = iccProvider.getIccInfo(i);
+        let icc = gIccService.getIccByServiceId(i);
+        let info = icc && icc.iccInfo;
         if (!info) {
           LOGE("Tried to get the ICC info for an invalid service ID " + i);
           continue;