Bug 986688 - Load SignInToWebsite.jsm lazily and on Nightly only. r=felipe

browser/modules/moz.build

@@ -16,7 +16,6 @@ EXTRA_JS_MODULES += [
     'NetworkPrioritizer.jsm',
     'offlineAppCache.jsm',
     'SharedFrame.jsm',
-    'SignInToWebsite.jsm',
     'SitePermissions.jsm',
     'Social.jsm',
     'TabCrashReporter.jsm',
@@ -31,6 +30,11 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
         'WindowsPreviewPerTab.jsm',
     ]
 
+if CONFIG['NIGHTLY_BUILD']:
+    EXTRA_JS_MODULES += [
+        'SignInToWebsite.jsm',
+    ]
+
 EXTRA_PP_JS_MODULES += [
     'AboutHome.jsm',
     'RecentWindow.jsm',

browser/modules/test/browser_SignInToWebsite.js

@@ -267,12 +267,22 @@ function test_auth() {
 function test() {
   waitForExplicitFinish();
 
+  let sitw = {};
+  try {
+    Components.utils.import("resource:///modules/SignInToWebsite.jsm", sitw);
+  } catch (ex) {
+    ok(true, "Skip the test since SignInToWebsite.jsm isn't packaged outside outside mozilla-central");
+    finish();
+    return;
+  }
+
   registerCleanupFunction(cleanUp);
 
-  let sitw = {};
-  Components.utils.import("resource:///modules/SignInToWebsite.jsm", sitw);
-
   ok(sitw.SignInToWebsiteUX, "SignInToWebsiteUX object exists");
+  if (!Services.prefs.getBoolPref("dom.identity.enabled")) {
+    // If the pref isn't enabled then init wasn't called so do that for the test.
+    sitw.SignInToWebsiteUX.init();
+  }
 
   // Replace implementation of ID Service functions for testing
   window.selectIdentity = sitw.SignInToWebsiteUX.selectIdentity;
@@ -317,6 +327,9 @@ function cleanUp() {
   Components.utils.import("resource:///modules/SignInToWebsite.jsm", sitw);
   sitw.SignInToWebsiteUX.selectIdentity = window.selectIdentity;
   delete window.selectIdentity;
+  if (!Services.prefs.getBoolPref("dom.identity.enabled")) {
+    sitw.SignInToWebsiteUX.uninit();
+  }
 
   Services.prefs.clearUserPref("toolkit.identity.debug");
 }