update

apps/settings/js/firefox_accounts/menu_loader.js

@@ -3,20 +3,18 @@
 'use strict';
 
 require(['shared/lazy_loader'], function(LazyLoader) {
-  navigator.mozL10n.once(function loadWhenIdle() {
-    var idleObserver = {
-      time: 4,
-      onidle: function() {
-        navigator.removeIdleObserver(idleObserver);
-        LazyLoader.load([
-          '/shared/js/fxa_iac_client.js',
-          '/shared/js/text_normalizer.js',
-          'js/firefox_accounts/menu.js'
-        ], function fxa_menu_loaded() {
-          FxaMenu.init(FxAccountsIACHelper);
-        });
-      }
-    };
-    navigator.addIdleObserver(idleObserver);
-  });
+  var idleObserver = {
+    time: 4,
+    onidle: function() {
+      navigator.removeIdleObserver(idleObserver);
+      LazyLoader.load([
+        '/shared/js/fxa_iac_client.js',
+        '/shared/js/text_normalizer.js',
+        'js/firefox_accounts/menu.js'
+      ], function fxa_menu_loaded() {
+        FxaMenu.init(FxAccountsIACHelper);
+      });
+    }
+  };
+  navigator.addIdleObserver(idleObserver);
 });

apps/settings/js/telephony_settings.js

@@ -23,44 +23,42 @@ window.TelephonySettingHelper = (function() {
         return resolve();
       }
 
-      navigator.mozL10n.once(function loadWhenIdle() {
-        var idleObserver = {
-          time: 3,
-          onidle: function() {
-            navigator.removeIdleObserver(idleObserver);
+      var idleObserver = {
+        time: 3,
+        onidle: function() {
+          navigator.removeIdleObserver(idleObserver);
 
-            DsdsSettings.init();
+          DsdsSettings.init();
 
-            TelephonyItemsHandler.init();
-            TelephonyItemsHandler.handleItems();
+          TelephonyItemsHandler.init();
+          TelephonyItemsHandler.handleItems();
 
-            AirplaneModeHelper.addEventListener('statechange',
-              TelephonyItemsHandler.handleItems);
+          AirplaneModeHelper.addEventListener('statechange',
+            TelephonyItemsHandler.handleItems);
 
-            tsh_addListeners();
+          tsh_addListeners();
 
-            _iccManager.addEventListener('iccdetected',
-              function iccDetectedHandler(evt) {
-                if (_mobileConnections[0].iccId &&
-                  (_mobileConnections[0].iccId === evt.iccId)) {
-                  TelephonyItemsHandler.handleItems();
-                  tsh_addListeners();
-                }
-              });
+          _iccManager.addEventListener('iccdetected',
+            function iccDetectedHandler(evt) {
+              if (_mobileConnections[0].iccId &&
+                (_mobileConnections[0].iccId === evt.iccId)) {
+                TelephonyItemsHandler.handleItems();
+                tsh_addListeners();
+              }
+            });
 
-            _iccManager.addEventListener('iccundetected',
-              function iccUndetectedHandler(evt) {
-                if (_iccId === evt.iccId) {
-                  _mobileConnections[0].removeEventListener('datachange',
-                    TelephonyItemsHandler.handleItems);
-                }
-              });
+          _iccManager.addEventListener('iccundetected',
+            function iccUndetectedHandler(evt) {
+              if (_iccId === evt.iccId) {
+                _mobileConnections[0].removeEventListener('datachange',
+                  TelephonyItemsHandler.handleItems);
+              }
+            });
 
-            resolve();
-          }
-        };
-        navigator.addIdleObserver(idleObserver);
-      });
+          resolve();
+        }
+      };
+      navigator.addIdleObserver(idleObserver);
     });
   }
 

apps/settings/test/unit/download_helper_test.js

@@ -1,10 +1,9 @@
-/* global MocksHelper, MockL10n, MockGetDeviceStorages, MockMozDownloads,
+/* global MocksHelper, MockGetDeviceStorages, MockMozDownloads,
           MockDownload, DownloadHelper, MockGetDeviceStorage,
           DownloadFormatter  */
 
 'use strict';
 
-require('/shared/test/unit/mocks/mock_l10n.js');
 require('/shared/test/unit/mocks/mock_download.js');
 require('/shared/test/unit/mocks/mock_navigator_moz_downloads.js');
 
@@ -37,7 +36,7 @@ suite('DownloadHelper', function() {
     'DownloadFormatter',
     'MozActivity'
   ]);
-  var realL10n, realDeviceStorage, realMozDownloads, download,
+  var realDeviceStorage, realMozDownloads, download,
    realDeviceStorages;
 
   mocksHelperForDownloadHelper.attachTestHelpers();
@@ -46,9 +45,6 @@ suite('DownloadHelper', function() {
   var TICK = 1000;
 
   suiteSetup(function() {
-    realL10n = navigator.mozL10n;
-    navigator.mozL10n = MockL10n;
-
     realDeviceStorages = navigator.getDeviceStorages;
     navigator.getDeviceStorages = MockGetDeviceStorages;
 
@@ -60,9 +56,6 @@ suite('DownloadHelper', function() {
   });
 
   suiteTeardown(function() {
-    navigator.mozL10n = realL10n;
-    realL10n = null;
-
     navigator.getDeviceStorages = realDeviceStorages;
     realDeviceStorages = null;
 

apps/settings/test/unit/download_ui_test.js

@@ -1,4 +1,4 @@
-/* global MocksHelper, MockL10n, MockDownload, DownloadUI, DownloadFormatter */
+/* global MocksHelper, MockDownload, DownloadUI, DownloadFormatter */
 
 
 'use strict';
@@ -7,7 +7,6 @@ requireApp('settings/test/unit/mock_mime_mapper.js');
 require('/shared/test/unit/mocks/mock_lazy_loader.js');
 require('/shared/test/unit/mocks/mock_download.js');
 require('/shared/test/unit/mocks/mock_download_formatter.js');
-require('/shared/test/unit/mocks/mock_l10n.js');
 
 require('/shared/js/download/download_ui.js');
 
@@ -18,7 +17,7 @@ var mocksHelperForDownloadUI = new MocksHelper([
 ]).init();
 
 suite('DownloadUI', function() {
-  var realL10n, download, dialogSelector = '#downloadConfirmUI',
+  var download, dialogSelector = '#downloadConfirmUI',
       dialogButtonsSelector = '#downloadConfirmUI button',
       actionMenuSelector = '#downloadActionMenuUI',
       actionMenuButtonsSelector = '#downloadActionMenuUI button',
@@ -28,17 +27,9 @@ suite('DownloadUI', function() {
 
   mocksHelperForDownloadUI.attachTestHelpers();
 
-  suiteSetup(function() {
-    realL10n = navigator.mozL10n;
-    navigator.mozL10n = MockL10n;
-  });
-
   suiteTeardown(function() {
     var screen = document.getElementById('screen');
     document.body.removeChild(screen);
-
-    navigator.mozL10n = realL10n;
-    realL10n = null;
   });
 
   setup(function() {

apps/settings/test/unit/findmydevice_panel_test.js

@@ -23,23 +23,13 @@ var mocksForFindMyDevice = new MocksHelper([
 
 suite('Find My Device panel > ', function() {
   var MockMozId, realMozId;
-  var realL10n, subject;
+  var subject;
   var signinSection, settingsSection, trackingSection, login, loginButton,
       checkbox, unverifiedError;
 
   mocksForFindMyDevice.attachTestHelpers();
 
   setup(function(done) {
-    realL10n = navigator.mozL10n;
-    navigator.mozL10n = {
-      once: function(callback) {
-        // XXX(ggp) we'll manually init() below, so we don't
-        // need to call the callback now.
-      },
-      setAttributes: function(element, id) {
-      },
-    };
-
     realMozId = navigator.mozId;
     MockMozId = {
       onlogin: null,
@@ -298,7 +288,6 @@ suite('Find My Device panel > ', function() {
   });
 
   teardown(function() {
-    navigator.mozL10n = realL10n;
     navigator.mozId = realMozId;
   });
 });

apps/settings/test/unit/icc_test.js

@@ -181,7 +181,6 @@ suite('STK (App menu) >', function() {
         ], map, function(MockStkHelper) {
           // we have to replace `require` in icc.js
           window.require = function(modules, callback) {
-            navigator.mozL10n = MockL10n;
             callback(MockStkHelper);
           };
           testRequire(['icc'], {}, function() {

apps/settings/test/unit/modules/date_time_test.js

@@ -1,7 +1,7 @@
 'use strict';
 
 suite('Date & Time > ', function() {
-  var realSettings, realTime, realL10n;
+  var realSettings, realTime;
   var DateTime;
 
   // keys
@@ -14,15 +14,14 @@ suite('Date & Time > ', function() {
   suiteSetup(function(done) {
     var modules = [
       'shared_mocks/mock_navigator_moz_settings',
-      'shared_mocks/mock_l10n',
       'modules/date_time'
     ];
     var maps = {
       '*': {}
     };
 
     testRequire(modules, maps, function(
-      MockNavigatorSettings, MockL10n, module) {
+      MockNavigatorSettings, module) {
       // mock settings
       realSettings = window.navigator.mozSettings;
       window.navigator.mozSettings = MockNavigatorSettings;
@@ -32,17 +31,13 @@ suite('Date & Time > ', function() {
       };
       realTime = window.navigator.mozTime;
       window.navigator.mozTime = MockTime;
-      // mock l10n
-      realL10n = window.navigator.mozL10n;
-      window.navigator.mozL10n = MockL10n;
 
       DateTime = module;
       done();
     });
   });
 
   suiteTeardown(function() {
-    window.navigator.mozL10n = realL10n;
     window.navigator.mozTime = realTime;
     window.navigator.mozSettings = realSettings;
   });

apps/settings/test/unit/modules/panel_utils_test.js

@@ -1,9 +1,7 @@
 'use strict';
 
 suite('PanelUtils', function() {
-  var realL10n;
   var modules = [
-    'shared_mocks/mock_l10n',
     'modules/panel_utils'
   ];
 
@@ -14,19 +12,13 @@ suite('PanelUtils', function() {
   };
 
   suiteSetup(function(done) {
-    testRequire(modules, map, (function(MockL10n, PanelUtils) {
+    testRequire(modules, map, (function(PanelUtils) {
       this.PanelUtils = PanelUtils;
 
-      realL10n = window.navigator.mozL10n;
-      window.navigator.mozL10n = MockL10n;
       done();
     }).bind(this));
   });
 
-  suiteTeardown(function() {
-    window.navigator.mozL10n = realL10n;
-  });
-
   suite('activate', function() {
     suiteSetup(function() {
       this.realOpenLink = window.openLink;

apps/settings/test/unit/modules/settings_panel_test.js

@@ -6,10 +6,8 @@ suite('SettingsPanel', function() {
       'modules/settings_panel',
       'modules/panel_utils',
       'modules/settings_cache',
-      'shared_mocks/mock_l10n'
-    ], (function(settingsPanelFunc, PanelUtils, SettingsCache, MockL10n) {
+    ], (function(settingsPanelFunc, PanelUtils, SettingsCache) {
       this.realL10n = navigator.mozL10n;
-      navigator.mozL10n = MockL10n;
 
       this.PanelUtils = PanelUtils;
       this.SettingsCache = SettingsCache;
@@ -18,11 +16,6 @@ suite('SettingsPanel', function() {
     }).bind(this));
   });
 
-  suiteTeardown(function() {
-    navigator.mozL10n = this.realL10n;
-    this.realL10n = null;
-  });
-
   suite('Basic functions', function() {
     setup(function() {
       this.panel = this.SettingsPanel();

apps/settings/test/unit/modules/settings_service_test.js

@@ -1,13 +1,10 @@
 'use strict';
 
 suite('SettingsService', function() {
-  var realL10n;
-
   suiteSetup(function(done) {
     navigator.addIdleObserver = sinon.spy();
 
     var modules = [
-      'shared_mocks/mock_l10n',
       'modules/settings_service',
       'modules/panel_cache',
       'unit/mock_settings_panel',
@@ -28,24 +25,18 @@ suite('SettingsService', function() {
     };
 
     testRequire(modules, map,
-      (function(MockL10n, SettingsService, PanelCache,
+      (function(SettingsService, PanelCache,
         MockSettingsPanel, MockSettings) {
           this.SettingsService = SettingsService;
           this.PanelCache = PanelCache;
           // Mock of the SettingsPanel function
           this.MockSettingsPanel = MockSettingsPanel;
           this.MockSettings = MockSettings;
 
-          realL10n = window.navigator.mozL10n;
-          window.navigator.mozL10n = MockL10n;
           done();
     }).bind(this));
   });
 
-  suiteTeardown(function() {
-    window.navigator.mozL10n = realL10n;
-  });
-
   setup(function() {
     this.SettingsService.reset();
     this.PanelCache.reset();