Backed out changeset 13ca7eb38c28 (bug 993282)

dom/contacts/fallback/ContactDB.jsm

@@ -15,11 +15,9 @@ const Cu = Components.utils;
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/IndexedDBHelper.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "PhoneNumberUtils",
+Cu.import("resource://gre/modules/PhoneNumberUtils.jsm");
-                                  "resource://gre/modules/PhoneNumberUtils.jsm");
 Cu.importGlobalProperties(["indexedDB"]);
 
 /* all exported symbols need to be bound to this on B2G - Bug 961777 */

dom/contacts/fallback/ContactService.jsm

@@ -15,11 +15,8 @@ this.EXPORTED_SYMBOLS = ["ContactService"];
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
-
+Cu.import("resource://gre/modules/ContactDB.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "ContactDB",
+Cu.import("resource://gre/modules/PhoneNumberUtils.jsm");
-                                  "resource://gre/modules/ContactDB.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "PhoneNumberUtils",
-                                  "resource://gre/modules/PhoneNumberUtils.jsm");
 
 XPCOMUtils.defineLazyServiceGetter(this, "ppmm",
                                    "@mozilla.org/parentprocessmessagemanager;1",

dom/phonenumberutils/PhoneNumber.jsm

@@ -8,13 +8,9 @@
 
 this.EXPORTED_SYMBOLS = ["PhoneNumber"];
 
-const Cu = Components.utils;
+Components.utils.import("resource://gre/modules/PhoneNumberMetaData.jsm");
+Components.utils.import("resource://gre/modules/PhoneNumberNormalizer.jsm");
 
-Cu.import('resource://gre/modules/XPCOMUtils.jsm');
-XPCOMUtils.defineLazyModuleGetter(this, "PHONE_NUMBER_META_DATA",
-                                  "resource://gre/modules/PhoneNumberMetaData.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "PhoneNumberNormalizer",
-                                  "resource://gre/modules/PhoneNumberNormalizer.jsm");
 this.PhoneNumber = (function (dataBase) {
   // Use strict in our context only - users might not want it
   'use strict';

dom/phonenumberutils/PhoneNumberUtils.jsm

@@ -14,10 +14,8 @@ const Ci = Components.interfaces;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import('resource://gre/modules/XPCOMUtils.jsm');
-XPCOMUtils.defineLazyModuleGetter(this, "PhoneNumberNormalizer",
+Cu.import("resource://gre/modules/PhoneNumberNormalizer.jsm");
-                                  "resource://gre/modules/PhoneNumberNormalizer.jsm");
+Cu.import("resource://gre/modules/mcc_iso3166_table.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "MCC_ISO3166_TABLE",
-                                  "resource://gre/modules/mcc_iso3166_table.jsm");
 
 #ifdef MOZ_B2G_RIL
 XPCOMUtils.defineLazyServiceGetter(this, "mobileConnection",
@@ -198,8 +196,7 @@ this.PhoneNumberUtils = {
 let inParent = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime)
                  .processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT;
 if (inParent) {
-  XPCOMUtils.defineLazyModuleGetter(this, "PhoneNumber",
+  Cu.import("resource://gre/modules/PhoneNumber.jsm");
-                                    "resource://gre/modules/PhoneNumber.jsm");
   XPCOMUtils.defineLazyServiceGetter(this, "ppmm",
                                      "@mozilla.org/parentprocessmessagemanager;1",
                                      "nsIMessageListenerManager");