Bug 527784 - "Browser code incorrectly looking for browser-only modules in gre location" [r=gavin]

browser/base/content/browser.js

@@ -1288,7 +1288,7 @@ function delayedStartup(isLoadingBlank, mustLoadSidebar) {
   }
 
   let NP = {};
-  Cu.import("resource://gre/modules/NetworkPrioritizer.jsm", NP);
+  Cu.import("resource://app/modules/NetworkPrioritizer.jsm", NP);
   NP.trackBrowserWindow(window);
 
   // initialize the session-restore service (in case it's not already running)

browser/base/content/openLocation.js

@@ -49,7 +49,7 @@ try {
   // not critical, remain silent
 }
 
-Components.utils.import("resource://gre/modules/openLocationLastURL.jsm");
+Components.utils.import("resource://app/modules/openLocationLastURL.jsm");
 
 function onLoad()
 {

browser/components/nsBrowserGlue.js

@@ -49,7 +49,7 @@ const Cu = Components.utils;
 const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource:///modules/distribution.js");
+Cu.import("resource://app/modules/distribution.js");
 
 const PREF_EM_NEW_ADDONS_LIST = "extensions.newAddons";
 const PREF_PLUGINS_NOTIFYUSER = "plugins.update.notifyUser";

browser/components/privatebrowsing/test/unit/test_openLocationLastURL.js

@@ -41,7 +41,7 @@ function run_test_on_service()
   let Cc = Components.classes;
   let Ci = Components.interfaces;
   let Cu = Components.utils;
-  Cu.import("resource://gre/modules/openLocationLastURL.jsm");
+  Cu.import("resource://app/modules/openLocationLastURL.jsm");
 
   let pb = Cc[PRIVATEBROWSING_CONTRACT_ID].
            getService(Ci.nsIPrivateBrowsingService);