Bug 1312486 - Enable no-extra-boolean-cast, no-new-object, no-shadow-restricted-names, and spaced-comment rules for eslint. r=standard8 draft
authorJared Wein <jwein@mozilla.com>
Mon, 24 Oct 2016 13:14:19 -0400
changeset 431864 9c8a6b15c19982d720b0163fbbf19d465da786fe
parent 431863 1aa20bcbb80e1014e4d01057f7d52269b0c2d908
child 535489 862ac741b7958347259da1cf418f1f123aed253c
push id34134
push userbmo:jaws@mozilla.com
push dateMon, 31 Oct 2016 21:25:03 +0000
reviewersstandard8
bugs1312486
milestone52.0a1
Bug 1312486 - Enable no-extra-boolean-cast, no-new-object, no-shadow-restricted-names, and spaced-comment rules for eslint. r=standard8 MozReview-Commit-ID: 7Gx90a5y8t6
browser/base/content/aboutaccounts/aboutaccounts.js
browser/base/content/browser-addons.js
browser/base/content/browser-fullZoom.js
browser/base/content/browser-places.js
browser/base/content/browser-syncui.js
browser/base/content/browser.js
browser/base/content/content.js
browser/base/content/pageinfo/pageInfo.js
browser/base/content/sanitize.js
browser/base/content/sync/aboutSyncTabs.js
browser/base/content/sync/setup.js
browser/base/content/test/general/browser_aboutAccounts.js
browser/base/content/test/general/browser_aboutSupport_newtab_security_state.js
browser/base/content/test/general/browser_bug416661.js
browser/base/content/test/general/browser_bug767836_perwindowpb.js
browser/base/content/test/general/browser_bug822367.js
browser/base/content/test/general/browser_bug902156.js
browser/base/content/test/general/browser_contextmenu.js
browser/base/content/test/general/browser_csp_block_all_mixedcontent.js
browser/base/content/test/general/browser_double_close_tab.js
browser/base/content/test/general/browser_fxa_oauth.js
browser/base/content/test/general/browser_fxaccounts.js
browser/base/content/test/general/browser_gZipOfflineChild.js
browser/base/content/test/general/browser_mcb_redirect.js
browser/base/content/test/general/browser_no_mcb_on_http_site.js
browser/base/content/test/general/browser_sanitizeDialog.js
browser/base/content/test/general/browser_scope.js
browser/base/content/test/general/browser_tabs_owner.js
browser/base/content/test/general/contextmenu_common.js
browser/base/content/test/social/browser_blocklist.js
browser/base/content/test/social/browser_share.js
browser/base/content/test/social/browser_social_activation.js
browser/base/content/test/urlbar/browser_bug623155.js
browser/base/content/utilityOverlay.js
browser/base/content/web-panels.js
browser/components/customizableui/CustomizableUI.jsm
browser/components/customizableui/CustomizableWidgets.jsm
browser/components/customizableui/CustomizeMode.jsm
browser/components/customizableui/DragPositionManager.jsm
browser/components/customizableui/content/panelUI.xml
browser/components/customizableui/test/browser_942581_unregisterArea_keeps_placements.js
browser/components/customizableui/test/browser_952963_areaType_getter_no_area.js
browser/components/customizableui/test/browser_968447_bookmarks_toolbar_items_in_panel.js
browser/components/customizableui/test/browser_973641_button_addon.js
browser/components/customizableui/test/browser_995164_registerArea_during_customize_mode.js
browser/components/feeds/WebContentConverter.js
browser/components/migration/ESEDBReader.jsm
browser/components/migration/IEProfileMigrator.js
browser/components/migration/MSMigrationUtils.jsm
browser/components/migration/MigrationUtils.jsm
browser/components/migration/tests/unit/test_IE7_passwords.js
browser/components/newtab/NewTabMessages.jsm
browser/components/newtab/aboutNewTabService.js
browser/components/newtab/tests/browser/browser_newtab_overrides.js
browser/components/newtab/tests/xpcshell/test_NewTabSearchProvider.js
browser/components/nsBrowserContentHandler.js
browser/components/places/PlacesUIUtils.jsm
browser/components/places/content/bookmarkProperties.js
browser/components/places/content/places.js
browser/components/places/tests/browser/browser_bookmarksProperties.js
browser/components/places/tests/browser/browser_drag_bookmarks_on_toolbar.js
browser/components/places/tests/browser/browser_library_batch_delete.js
browser/components/places/tests/browser/browser_library_infoBox.js
browser/components/places/tests/browser/browser_library_middleclick.js
browser/components/places/tests/browser/browser_library_search.js
browser/components/places/tests/browser/browser_sort_in_library.js
browser/components/preferences/cookies.js
browser/components/preferences/in-content/applications.js
browser/components/preferences/in-content/subdialogs.js
browser/components/preferences/in-content/sync.js
browser/components/search/test/browser_426329.js
browser/components/search/test/browser_searchbar_openpopup.js
browser/components/search/test/head.js
browser/components/translation/test/unit/test_cld2.js
browser/components/uitour/test/browser_UITour_modalDialog.js
browser/experiments/Experiments.jsm
browser/modules/ContentWebRTC.jsm
browser/modules/PluginContent.jsm
browser/modules/WindowsJumpLists.jsm
browser/modules/WindowsPreviewPerTab.jsm
browser/modules/test/browser_UsageTelemetry.js
browser/modules/test/browser_UsageTelemetry_searchbar.js
browser/tools/mozscreenshots/mozscreenshots/extension/Screenshot.jsm
browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm
browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Toolbars.jsm
storage/test/unit/head_storage.js
storage/test/unit/test_js_helpers.js
storage/test/unit/test_locale_collation.js
storage/test/unit/test_sqlite_secure_delete.js
storage/test/unit/test_statement_executeAsync.js
storage/test/unit/test_storage_connection.js
toolkit/.eslintrc.js
toolkit/components/aboutmemory/content/aboutMemory.js
toolkit/components/addoncompat/CompatWarning.jsm
toolkit/components/addoncompat/Prefetcher.jsm
toolkit/components/addoncompat/tests/addon/bootstrap.js
toolkit/components/asyncshutdown/nsAsyncShutdown.js
toolkit/components/contentprefs/nsContentPrefService.js
toolkit/components/contentprefs/tests/unit/head_contentPrefs.js
toolkit/components/contentprefs/tests/unit/test_contentPrefs.js
toolkit/components/cookie/content/cookieAcceptDialog.js
toolkit/components/crashes/tests/xpcshell/test_crash_manager.js
toolkit/components/downloads/nsDownloadManagerUI.js
toolkit/components/downloads/test/unit/tail_download_manager.js
toolkit/components/downloads/test/unit/test_app_rep_maclinux.js
toolkit/components/downloads/test/unit/test_app_rep_windows.js
toolkit/components/exthelper/extApplication.js
toolkit/components/feeds/FeedProcessor.js
toolkit/components/filepicker/content/filepicker.js
toolkit/components/filepicker/nsFilePicker.js
toolkit/components/jsdownloads/src/DownloadCore.jsm
toolkit/components/jsdownloads/src/DownloadImport.jsm
toolkit/components/jsdownloads/src/DownloadLegacy.js
toolkit/components/jsdownloads/src/DownloadList.jsm
toolkit/components/jsdownloads/src/DownloadStore.jsm
toolkit/components/jsdownloads/src/DownloadUIHelper.jsm
toolkit/components/jsdownloads/src/Downloads.jsm
toolkit/components/jsdownloads/test/browser/head.js
toolkit/components/jsdownloads/test/unit/common_test_Download.js
toolkit/components/jsdownloads/test/unit/head.js
toolkit/components/jsdownloads/test/unit/test_DownloadCore.js
toolkit/components/jsdownloads/test/unit/test_DownloadImport.js
toolkit/components/jsdownloads/test/unit/test_DownloadIntegration.js
toolkit/components/jsdownloads/test/unit/test_DownloadLegacy.js
toolkit/components/jsdownloads/test/unit/test_DownloadList.js
toolkit/components/jsdownloads/test/unit/test_DownloadStore.js
toolkit/components/jsdownloads/test/unit/test_Downloads.js
toolkit/components/lz4/lz4_internal.js
toolkit/components/lz4/tests/xpcshell/data/worker_lz4.js
toolkit/components/microformats/microformat-shiv.js
toolkit/components/microformats/update/update.js
toolkit/components/passwordmgr/LoginHelper.jsm
toolkit/components/passwordmgr/LoginImport.jsm
toolkit/components/passwordmgr/LoginStore.jsm
toolkit/components/passwordmgr/content/passwordManager.js
toolkit/components/passwordmgr/nsLoginManager.js
toolkit/components/passwordmgr/storage-mozStorage.js
toolkit/components/passwordmgr/test/browser/browser_username_select_dialog.js
toolkit/components/passwordmgr/test/browser/subtst_notifications_5.html
toolkit/components/passwordmgr/test/browser/subtst_notifications_6.html
toolkit/components/passwordmgr/test/mochitest/test_basic_form_2pw_2.html
toolkit/components/passwordmgr/test/mochitest/test_basic_form_autocomplete.html
toolkit/components/passwordmgr/test/mochitest/test_bug_627616.html
toolkit/components/passwordmgr/test/mochitest/test_form_action_2.html
toolkit/components/passwordmgr/test/mochitest/test_prompt_promptAuth_proxy.html
toolkit/components/passwordmgr/test/prompt_common.js
toolkit/components/passwordmgr/test/test_prompt_async.html
toolkit/components/passwordmgr/test/unit/head.js
toolkit/components/passwordmgr/test/unit/test_OSCrypto_win.js
toolkit/components/passwordmgr/test/unit/test_disabled_hosts.js
toolkit/components/passwordmgr/test/unit/test_getFormFields.js
toolkit/components/passwordmgr/test/unit/test_legacy_empty_formSubmitURL.js
toolkit/components/passwordmgr/test/unit/test_legacy_validation.js
toolkit/components/passwordmgr/test/unit/test_logins_change.js
toolkit/components/passwordmgr/test/unit/test_logins_decrypt_failure.js
toolkit/components/passwordmgr/test/unit/test_logins_metainfo.js
toolkit/components/passwordmgr/test/unit/test_logins_search.js
toolkit/components/passwordmgr/test/unit/test_module_LoginImport.js
toolkit/components/passwordmgr/test/unit/test_module_LoginStore.js
toolkit/components/passwordmgr/test/unit/test_storage.js
toolkit/components/passwordmgr/test/unit/test_telemetry.js
toolkit/components/perfmonitoring/PerformanceStats.jsm
toolkit/components/perfmonitoring/PerformanceWatcher.jsm
toolkit/components/places/Bookmarks.jsm
toolkit/components/places/History.jsm
toolkit/components/places/PlacesCategoriesStarter.js
toolkit/components/places/PlacesDBUtils.jsm
toolkit/components/places/PlacesTransactions.jsm
toolkit/components/places/PlacesUtils.jsm
toolkit/components/places/UnifiedComplete.js
toolkit/components/places/nsLivemarkService.js
toolkit/components/places/nsPlacesExpiration.js
toolkit/components/places/nsTaggingService.js
toolkit/components/places/tests/bookmarks/test_savedsearches.js
toolkit/components/places/tests/browser/browser_bug680727.js
toolkit/components/places/tests/browser/browser_colorAnalyzer.js
toolkit/components/places/tests/browser/browser_favicon_setAndFetchFaviconForPage_failures.js
toolkit/components/places/tests/expiration/test_analyze_runs.js
toolkit/components/places/tests/favicons/test_favicons_conversions.js
toolkit/components/places/tests/favicons/test_getFaviconDataForPage.js
toolkit/components/places/tests/favicons/test_getFaviconURLForPage.js
toolkit/components/places/tests/favicons/test_moz-anno_favicon_mime_type.js
toolkit/components/places/tests/history/test_remove.js
toolkit/components/places/tests/network/test_history_redirects.js
toolkit/components/places/tests/queries/head_queries.js
toolkit/components/places/tests/queries/test_abstime-annotation-domain.js
toolkit/components/places/tests/queries/test_abstime-annotation-uri.js
toolkit/components/places/tests/queries/test_containersQueries_sorting.js
toolkit/components/places/tests/queries/test_onlyBookmarked.js
toolkit/components/places/tests/queries/test_querySerialization.js
toolkit/components/places/tests/queries/test_redirects.js
toolkit/components/places/tests/queries/test_sorting.js
toolkit/components/places/tests/queries/test_tags.js
toolkit/components/places/tests/queries/test_transitions.js
toolkit/components/places/tests/unifiedcomplete/head_autocomplete.js
toolkit/components/places/tests/unit/nsDummyObserver.js
toolkit/components/places/tests/unit/test_000_frecency.js
toolkit/components/places/tests/unit/test_405497.js
toolkit/components/places/tests/unit/test_412132.js
toolkit/components/places/tests/unit/test_async_history_api.js
toolkit/components/places/tests/unit/test_autocomplete_stopSearch_no_throw.js
toolkit/components/places/tests/unit/test_bookmarks_json.js
toolkit/components/places/tests/unit/test_bookmarks_restore_notification.js
toolkit/components/places/tests/unit/test_history.js
toolkit/components/places/tests/unit/test_history_observer.js
toolkit/components/places/tests/unit/test_placesTxn.js
toolkit/components/places/tests/unit/test_preventive_maintenance.js
toolkit/components/places/tests/unit/test_sql_guid_functions.js
toolkit/components/places/tests/unit/test_telemetry.js
toolkit/components/places/tests/unit/test_utils_setAnnotationsFor.js
toolkit/components/printing/content/printPageSetup.js
toolkit/components/printing/content/printPreviewProgress.js
toolkit/components/printing/content/printProgress.js
toolkit/components/printing/content/printUtils.js
toolkit/components/printing/content/printdialog.js
toolkit/components/printing/content/printjoboptions.js
toolkit/components/prompts/test/chromeScript.js
toolkit/components/reader/AboutReader.jsm
toolkit/components/satchel/nsFormAutoCompleteResult.jsm
toolkit/components/satchel/nsFormHistory.js
toolkit/components/satchel/test/test_form_autocomplete_with_list.html
toolkit/components/sqlite/sqlite_internal.js
toolkit/components/startup/tests/browser/browser_bug537449.js
toolkit/components/telemetry/TelemetryEnvironment.jsm
toolkit/components/telemetry/TelemetryStorage.jsm
toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
toolkit/components/terminator/nsTerminatorTelemetry.js
toolkit/components/thumbnails/PageThumbUtils.jsm
toolkit/components/thumbnails/PageThumbs.jsm
toolkit/components/urlformatter/tests/unit/test_urlformatter.js
toolkit/components/xulstore/XULStore.js
toolkit/content/browser-content.js
toolkit/content/contentAreaUtils.js
toolkit/content/customizeToolbar.js
toolkit/content/finddialog.js
toolkit/content/tests/browser/browser_content_url_annotation.js
toolkit/content/tests/chrome/file_autocomplete_with_composition.js
toolkit/content/tests/fennec-tile-testapp/chrome/content/BrowserView.js
toolkit/content/tests/fennec-tile-testapp/chrome/content/FooScript.js
toolkit/content/tests/fennec-tile-testapp/chrome/content/TileManager.js
toolkit/content/tests/fennec-tile-testapp/chrome/content/WidgetStack.js
toolkit/content/tests/widgets/test_mousecapture_area.html
toolkit/content/widgets/autocomplete.xml
toolkit/content/widgets/dialog.xml
toolkit/content/widgets/menulist.xml
toolkit/content/widgets/popup.xml
toolkit/content/widgets/videocontrols.xml
toolkit/crashreporter/CrashSubmit.jsm
toolkit/forgetaboutsite/test/unit/test_removeDataFromDomain.js
toolkit/modules/BrowserUtils.jsm
toolkit/modules/DeferredTask.jsm
toolkit/modules/FinderHighlighter.jsm
toolkit/modules/JSONFile.jsm
toolkit/modules/PopupNotifications.jsm
toolkit/modules/Promise-backend.js
toolkit/modules/SpatialNavigation.jsm
toolkit/modules/Task.jsm
toolkit/modules/secondscreen/RokuApp.jsm
toolkit/modules/tests/browser/browser_PromiseMessage.js
toolkit/modules/tests/xpcshell/test_DeferredTask.js
toolkit/modules/tests/xpcshell/test_JSONFile.js
toolkit/modules/tests/xpcshell/test_NewTabUtils.js
toolkit/modules/tests/xpcshell/test_Promise.js
toolkit/modules/tests/xpcshell/test_PromiseUtils.js
toolkit/modules/tests/xpcshell/test_Services.js
toolkit/modules/tests/xpcshell/test_web_channel_broker.js
toolkit/mozapps/downloads/DownloadTaskbarProgress.jsm
toolkit/mozapps/downloads/content/DownloadProgressListener.js
toolkit/mozapps/downloads/content/downloads.js
toolkit/mozapps/downloads/content/helperApps.js
toolkit/mozapps/extensions/DeferredSave.jsm
toolkit/mozapps/extensions/LightweightThemeManager.jsm
toolkit/mozapps/extensions/addonManager.js
toolkit/mozapps/extensions/content/extensions.js
toolkit/mozapps/extensions/content/extensions.xml
toolkit/mozapps/extensions/content/update.js
toolkit/mozapps/extensions/internal/AddonRepository.jsm
toolkit/mozapps/extensions/internal/AddonRepository_SQLiteMigrator.jsm
toolkit/mozapps/extensions/internal/Content.js
toolkit/mozapps/extensions/internal/GMPProvider.jsm
toolkit/mozapps/extensions/internal/PluginProvider.jsm
toolkit/mozapps/extensions/internal/ProductAddonChecker.jsm
toolkit/mozapps/extensions/internal/XPIProvider.jsm
toolkit/mozapps/extensions/internal/XPIProviderUtils.js
toolkit/mozapps/extensions/nsBlocklistService.js
toolkit/mozapps/extensions/test/browser/discovery_install.html
toolkit/mozapps/extensions/test/browser/head.js
toolkit/mozapps/extensions/test/mochitest/test_bug887098.html
toolkit/mozapps/extensions/test/xpcshell/head_unpack.js
toolkit/mozapps/extensions/test/xpcshell/test_blocklist_metadata_filters.js
toolkit/mozapps/extensions/test/xpcshell/test_blocklist_prefs.js
toolkit/mozapps/extensions/test/xpcshell/test_blocklist_regexp.js
toolkit/mozapps/extensions/test/xpcshell/test_blocklistchange.js
toolkit/mozapps/extensions/test/xpcshell/test_bug393285.js
toolkit/mozapps/extensions/test/xpcshell/test_bug406118.js
toolkit/mozapps/extensions/test/xpcshell/test_bug455906.js
toolkit/mozapps/extensions/test/xpcshell/test_bug514327_2.js
toolkit/mozapps/extensions/test/xpcshell/test_bug655254.js
toolkit/mozapps/extensions/test/xpcshell/test_delay_update_webextension.js
toolkit/mozapps/extensions/test/xpcshell/test_fuel.js
toolkit/mozapps/extensions/test/xpcshell/test_install.js
toolkit/mozapps/extensions/test/xpcshell/test_no_addons.js
toolkit/mozapps/extensions/test/xpcshell/test_softblocked.js
toolkit/mozapps/extensions/test/xpcshell/test_undothemeuninstall.js
toolkit/mozapps/extensions/test/xpcshell/test_undouninstall.js
toolkit/mozapps/extensions/test/xpinstall/browser_auth3.js
toolkit/mozapps/extensions/test/xpinstall/browser_auth4.js
toolkit/mozapps/extensions/test/xpinstall/browser_concurrent_installs.js
toolkit/mozapps/extensions/test/xpinstall/browser_localfile.js
toolkit/mozapps/extensions/test/xpinstall/browser_localfile2.js
toolkit/mozapps/extensions/test/xpinstall/browser_localfile3.js
toolkit/mozapps/extensions/test/xpinstall/browser_localfile4.js
toolkit/mozapps/extensions/test/xpinstall/bug645699.html
toolkit/mozapps/extensions/test/xpinstall/concurrent_installs.html
toolkit/mozapps/extensions/test/xpinstall/enabled.html
toolkit/mozapps/extensions/test/xpinstall/installchrome.html
toolkit/mozapps/extensions/test/xpinstall/installtrigger.html
toolkit/mozapps/extensions/test/xpinstall/startsoftwareupdate.html
toolkit/mozapps/extensions/test/xpinstall/triggerredirect.html
toolkit/mozapps/handling/content/dialog.js
toolkit/mozapps/handling/nsContentDispatchChooser.js
toolkit/mozapps/preferences/changemp.js
toolkit/mozapps/update/nsUpdateService.js
toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
toolkit/mozapps/update/tests/unit_aus_update/remoteUpdateXML.js
--- a/browser/base/content/aboutaccounts/aboutaccounts.js
+++ b/browser/base/content/aboutaccounts/aboutaccounts.js
@@ -21,17 +21,17 @@ const PREF_SYNC_SHOW_CUSTOMIZATION = "se
 const ACTION_URL_PARAM = "action";
 
 const OBSERVER_TOPICS = [
   fxAccountsCommon.ONVERIFIED_NOTIFICATION,
   fxAccountsCommon.ONLOGOUT_NOTIFICATION,
 ];
 
 function log(msg) {
-  //dump("FXA: " + msg + "\n");
+  // dump("FXA: " + msg + "\n");
 }
 
 function error(msg) {
   console.log("Firefox Account Error: " + msg + "\n");
 }
 
 function getPreviousAccountNameHash() {
   try {
--- a/browser/base/content/browser-addons.js
+++ b/browser/base/content/browser-addons.js
@@ -650,17 +650,17 @@ var LightWeightThemeWebInstaller = {
   },
 
   _isAllowed: function (srcURIString) {
     let uri;
     try {
       uri = makeURI(srcURIString);
     }
     catch (e) {
-      //makeURI fails if srcURIString is a nonsense URI
+      // makeURI fails if srcURIString is a nonsense URI
       return false;
     }
 
     if (!uri.schemeIs("https")) {
       return false;
     }
 
     let pm = Services.perms;
--- a/browser/base/content/browser-fullZoom.js
+++ b/browser/base/content/browser-fullZoom.js
@@ -23,26 +23,26 @@ var FullZoom = {
   // Stores initial locations if we receive onLocationChange
   // events before we're initialized.
   _initialLocations: new WeakMap(),
 
   get siteSpecific() {
     return this._siteSpecificPref;
   },
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // nsISupports
 
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIDOMEventListener,
                                          Ci.nsIObserver,
                                          Ci.nsIContentPrefObserver,
                                          Ci.nsISupportsWeakReference,
                                          Ci.nsISupports]),
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // Initialization & Destruction
 
   init: function FullZoom_init() {
     gBrowser.addEventListener("ZoomChangeUsingMouseWheel", this);
 
     // Register ourselves with the service so we know when our pref changes.
     this._cps2 = Cc["@mozilla.org/content-pref/service;1"].
                  getService(Ci.nsIContentPrefService2);
@@ -70,17 +70,17 @@ var FullZoom = {
 
   destroy: function FullZoom_destroy() {
     gPrefService.removeObserver("browser.zoom.", this);
     this._cps2.removeObserverForName(this.name, this);
     gBrowser.removeEventListener("ZoomChangeUsingMouseWheel", this);
   },
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // Event Handlers
 
   // nsIDOMEventListener
 
   handleEvent: function FullZoom_handleEvent(event) {
     switch (event.type) {
       case "ZoomChangeUsingMouseWheel":
         let browser = this._getTargetedBrowser(event);
@@ -241,17 +241,17 @@ var FullZoom = {
   // update state of zoom type menu item
 
   updateMenu: function FullZoom_updateMenu() {
     var menuItem = document.getElementById("toggle_zoom");
 
     menuItem.setAttribute("checked", !ZoomManager.useFullZoom);
   },
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // Setting & Pref Manipulation
 
   /**
    * Reduces the zoom level of the page in the current browser.
    */
   reduce: function FullZoom_reduce() {
     ZoomManager.reduce();
     let browser = gBrowser.selectedBrowser;
@@ -386,17 +386,17 @@ var FullZoom = {
     let ctxt = this._loadContextFromBrowser(browser);
     this._cps2.removeByDomainAndName(browser.currentURI.spec, this.name, ctxt, {
       handleCompletion: function () {
         this._isNextContentPrefChangeInternal = true;
       }.bind(this),
     });
   },
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // Utilities
 
   /**
    * Returns the zoom change token of the given browser.  Asynchronous
    * operations that access the given browser's zoom should use this method to
    * capture the token before starting and use token.isCurrent to determine if
    * it's safe to access the zoom when done.  If token.isCurrent is false, then
    * after the async operation started, either the browser's zoom was changed or
--- a/browser/base/content/browser-places.js
+++ b/browser/base/content/browser-places.js
@@ -1,14 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-////////////////////////////////////////////////////////////////////////////////
-//// StarUI
+// //////////////////////////////////////////////////////////////////////////////
+// // StarUI
 
 var StarUI = {
   _itemId: -1,
   uri: null,
   _batching: false,
   _isNewBookmark: false,
   _autoCloseTimer: 0,
 
@@ -117,17 +117,17 @@ var StarUI = {
         switch (aEvent.keyCode) {
           case KeyEvent.DOM_VK_ESCAPE:
             this.panel.hidePopup();
             break;
           case KeyEvent.DOM_VK_RETURN:
             if (aEvent.target.classList.contains("expander-up") ||
                 aEvent.target.classList.contains("expander-down") ||
                 aEvent.target.id == "editBMPanel_newFolderButton")  {
-              //XXX Why is this necessary? The defaultPrevented check should
+              // XXX Why is this necessary? The defaultPrevented check should
               //    be enough.
               break;
             }
             this.panel.hidePopup();
             break;
           // This case is for catching character-generating keypresses
           case 0:
             let accessKey = document.getElementById("key_close");
@@ -340,18 +340,18 @@ var StarUI = {
     }
     else {
       PlacesUtils.transactionManager.endBatch(false);
     }
     this._batching = false;
   }
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// PlacesCommandHook
+// //////////////////////////////////////////////////////////////////////////////
+// // PlacesCommandHook
 
 var PlacesCommandHook = {
   /**
    * Adds a bookmark to the page loaded in the given browser.
    *
    * @param aBrowser
    *        a <browser> element.
    * @param [optional] aParent
@@ -667,18 +667,18 @@ var PlacesCommandHook = {
     }
     else {
       organizer.PlacesOrganizer.selectLeftPaneContainerByHierarchy(aLeftPaneRoot);
       organizer.focus();
     }
   }
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// HistoryMenu
+// //////////////////////////////////////////////////////////////////////////////
+// // HistoryMenu
 
 XPCOMUtils.defineLazyModuleGetter(this, "RecentlyClosedTabsAndWindowsMenuUtils",
   "resource:///modules/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm");
 
 // View for the history menu.
 function HistoryMenu(aPopupShowingEvent) {
   // Workaround for Bug 610187.  The sidebar does not include all the Places
   // views definitions, and we don't need them there.
@@ -806,18 +806,18 @@ HistoryMenu.prototype = {
     if (placesNode) {
       if (!PrivateBrowsingUtils.isWindowPrivate(window))
         PlacesUIUtils.markPageAsTyped(placesNode.uri);
       openUILink(placesNode.uri, aEvent, { ignoreAlt: true });
     }
   }
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// BookmarksEventHandler
+// //////////////////////////////////////////////////////////////////////////////
+// // BookmarksEventHandler
 
 /**
  * Functions for handling events in the Bookmarks Toolbar and menu.
  */
 var BookmarksEventHandler = {
   /**
    * Handler for click event for an item in the bookmarks toolbar or menu.
    * Menus and submenus from the folder buttons bubble up to this handler.
@@ -935,18 +935,18 @@ var BookmarksEventHandler = {
     if (!tooltipUrl.hidden)
       tooltipUrl.value = url;
 
     // Show tooltip.
     return true;
   }
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// PlacesMenuDNDHandler
+// //////////////////////////////////////////////////////////////////////////////
+// // PlacesMenuDNDHandler
 
 // Handles special drag and drop functionality for Places menus that are not
 // part of a Places view (e.g. the bookmarks menu in the menubar).
 var PlacesMenuDNDHandler = {
   _springLoadDelayMs: 350,
   _closeDelayMs: 500,
   _loadTimer: null,
   _closeTimer: null,
@@ -1066,18 +1066,18 @@ var PlacesMenuDNDHandler = {
                                 PlacesUtils.bookmarks.DEFAULT_INDEX,
                                 Components.interfaces.nsITreeView.DROP_ON);
     PlacesControllerDragHelper.onDrop(ip, event.dataTransfer);
     PlacesControllerDragHelper.currentDropTarget = null;
     event.stopPropagation();
   }
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// PlacesToolbarHelper
+// //////////////////////////////////////////////////////////////////////////////
+// // PlacesToolbarHelper
 
 /**
  * This object handles the initialization and uninitialization of the bookmarks
  * toolbar.
  */
 var PlacesToolbarHelper = {
   _place: "place:folder=TOOLBAR",
 
@@ -1213,18 +1213,18 @@ var PlacesToolbarHelper = {
       if (this._viewElt._placesView) {
         this._viewElt._placesView.uninit();
       }
       this.init(true);
     }
   },
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// BookmarkingUI
+// //////////////////////////////////////////////////////////////////////////////
+// // BookmarkingUI
 
 /**
  * Handles the bookmarks menu-button in the toolbar.
  */
 
 var BookmarkingUI = {
   BOOKMARK_BUTTON_ID: "bookmarks-menu-button",
   BOOKMARK_BUTTON_SHORTCUT: "addBookmarkAsKb",
--- a/browser/base/content/browser-syncui.js
+++ b/browser/base/content/browser-syncui.js
@@ -525,17 +525,17 @@ var gSyncUI = {
 
   QueryInterface: XPCOMUtils.generateQI([
     Ci.nsIObserver,
     Ci.nsISupportsWeakReference
   ])
 };
 
 XPCOMUtils.defineLazyGetter(gSyncUI, "_stringBundle", function() {
-  //XXXzpao these strings should probably be moved from /services to /browser... (bug 583381)
+  // XXXzpao these strings should probably be moved from /services to /browser... (bug 583381)
   //        but for now just make it work
   return Cc["@mozilla.org/intl/stringbundle;1"].
          getService(Ci.nsIStringBundleService).
          createBundle("chrome://weave/locale/services/sync.properties");
 });
 
 XPCOMUtils.defineLazyGetter(gSyncUI, "log", function() {
   return Log.repository.getLogger("browserwindow.syncui");
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -166,17 +166,17 @@ var gMultiProcessBrowser =
 var gAppInfo = Cc["@mozilla.org/xre/app-info;1"]
                   .getService(Ci.nsIXULAppInfo)
                   .QueryInterface(Ci.nsIXULRuntime);
 
 if (AppConstants.platform != "macosx") {
   var gEditUIVisible = true;
 }
 
-/*globals gBrowser, gNavToolbox, gURLBar, gNavigatorBundle*/
+/* globals gBrowser, gNavToolbox, gURLBar, gNavigatorBundle*/
 [
   ["gBrowser",            "content"],
   ["gNavToolbox",         "navigator-toolbox"],
   ["gURLBar",             "urlbar"],
   ["gNavigatorBundle",    "bundle_browser"]
 ].forEach(function (elementGlobal) {
   var [name, id] = elementGlobal;
   window.__defineGetter__(name, function () {
@@ -4059,17 +4059,17 @@ function OpenBrowserWindow(options)
   // set, then extract the current charset menu setting from the current document and use it to
   // initialize the new browser window...
   var win;
   if (window && (wintype == "navigator:browser") && window.content && window.content.document)
   {
     var DocCharset = window.content.document.characterSet;
     charsetArg = "charset="+DocCharset;
 
-    //we should "inherit" the charset menu setting in a new window
+    // we should "inherit" the charset menu setting in a new window
     win = window.openDialog("chrome://browser/content/", "_blank", "chrome,all,dialog=no" + extraFeatures, defaultArgs, charsetArg);
   }
   else // forget about the charset information.
   {
     win = window.openDialog("chrome://browser/content/", "_blank", "chrome,all,dialog=no" + extraFeatures, defaultArgs);
   }
 
   return win;
@@ -5920,17 +5920,17 @@ var LanguageDetectionListener = {
     });
   }
 };
 
 
 var BrowserOffline = {
   _inited: false,
 
-  /////////////////////////////////////////////////////////////////////////////
+  // ///////////////////////////////////////////////////////////////////////////
   // BrowserOffline Public Methods
   init: function ()
   {
     if (!this._uiElement)
       this._uiElement = document.getElementById("workOfflineMenuitemState");
 
     Services.obs.addObserver(this, "network:offline-status-changed", false);
 
@@ -5953,29 +5953,29 @@ var BrowserOffline = {
     if (!ioService.offline && !this._canGoOffline()) {
       this._updateOfflineUI(false);
       return;
     }
 
     ioService.offline = !ioService.offline;
   },
 
-  /////////////////////////////////////////////////////////////////////////////
+  // ///////////////////////////////////////////////////////////////////////////
   // nsIObserver
   observe: function (aSubject, aTopic, aState)
   {
     if (aTopic != "network:offline-status-changed")
       return;
 
     // This notification is also received because of a loss in connectivity,
     // which we ignore by updating the UI to the current value of io.offline
     this._updateOfflineUI(Services.io.offline);
   },
 
-  /////////////////////////////////////////////////////////////////////////////
+  // ///////////////////////////////////////////////////////////////////////////
   // BrowserOffline Implementation Methods
   _canGoOffline: function ()
   {
     try {
       var cancelGoOffline = Cc["@mozilla.org/supports-PRBool;1"].createInstance(Ci.nsISupportsPRBool);
       Services.obs.notifyObservers(cancelGoOffline, "offline-requested", null);
 
       // Something aborted the quit process.
@@ -7725,17 +7725,17 @@ function switchToTabHavingURI(aURI, aOpe
     // are private and they are not in permanent private browsing mode
     if (!kPrivateBrowsingWhitelist.has(aURI.spec) &&
         (PrivateBrowsingUtils.isWindowPrivate(window) ||
          PrivateBrowsingUtils.isWindowPrivate(aWindow)) &&
         !PrivateBrowsingUtils.permanentPrivateBrowsing) {
       return false;
     }
 
-    //Remove the query string, fragment, both, or neither from a given url.
+    // Remove the query string, fragment, both, or neither from a given url.
     function cleanURL(url, removeQuery, removeFragment) {
       let ret = url;
       if (removeFragment) {
         ret = ret.split("#")[0];
         if (removeQuery) {
           // This removes a query, if present before the fragment.
           ret = ret.split("?")[0];
         }
--- a/browser/base/content/content.js
+++ b/browser/base/content/content.js
@@ -1298,17 +1298,17 @@ var PageInfoListener = {
       result.SVGImageElementHeight = item.height.baseVal.value;
     }
 
     result.baseURI = item.baseURI;
 
     return result;
   },
 
-  //******** Other Misc Stuff
+  //* ******* Other Misc Stuff
   // Modified from the Links Panel v2.3, http://segment7.net/mozilla/links/links.html
   // parse a node to extract the contents of the node
   getValueText: function(node)
   {
 
     let valueText = "";
 
     // Form input elements don't generally contain information that is useful to our callers, so return nothing.
--- a/browser/base/content/pageinfo/pageInfo.js
+++ b/browser/base/content/pageinfo/pageInfo.js
@@ -1,16 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 Components.utils.import("resource://gre/modules/LoadContextInfo.jsm");
 Components.utils.import("resource://gre/modules/Services.jsm");
 
-//******** define a js object to implement nsITreeView
+//* ******* define a js object to implement nsITreeView
 function pageInfoTreeView(treeid, copycol)
 {
   // copycol is the index number for the column that we want to add to
   // the copy-n-paste buffer when the user hits accel-c
   this.treeid = treeid;
   this.copycol = copycol;
   this.rows = 0;
   this.tree = null;
@@ -631,17 +631,17 @@ function addImage(imageViewRow)
         gImageElement.width == elem.width &&
         gImageElement.height == elem.height &&
         gImageElement.imageText == elem.imageText) {
       gImageView.data[i][COL_IMAGE_NODE] = elem;
     }
   }
 }
 
-//******** Link Stuff
+//* ******* Link Stuff
 function openURL(target)
 {
   var url = target.parentNode.childNodes[2].value;
   window.open(url, "_blank", "chrome");
 }
 
 function onBeginLinkDrag(event, urlField, descField)
 {
@@ -663,17 +663,17 @@ function onBeginLinkDrag(event, urlField
   var desc = tree.view.getCellText(row, col);
 
   var dt = event.dataTransfer;
   dt.setData("text/x-moz-url", url + "\n" + desc);
   dt.setData("text/url-list", url);
   dt.setData("text/plain", url);
 }
 
-//******** Image Stuff
+//* ******* Image Stuff
 function getSelectedRows(tree)
 {
   var start = { };
   var end   = { };
   var numRanges = tree.view.selection.getRangeCount();
 
   var rowArray = [ ];
   for (var t = 0; t < numRanges; t++) {
--- a/browser/base/content/sanitize.js
+++ b/browser/base/content/sanitize.js
@@ -285,17 +285,17 @@ Sanitizer.prototype = {
         // For this reason, instead of waiting for sanitization to always
         // complete, we introduce a soft timeout. Once this timeout has
         // elapsed, we proceed with the shutdown of Firefox.
         let promiseClearPluginCookies;
         try {
           // We don't want to wait for this operation to complete...
           promiseClearPluginCookies = this.promiseClearPluginCookies(range);
 
-          //... at least, not for more than 10 seconds.
+          // ... at least, not for more than 10 seconds.
           yield Promise.race([
             promiseClearPluginCookies,
             new Promise(resolve => setTimeout(resolve, 10000 /* 10 seconds */))
           ]);
         } catch (ex) {
           seenException = ex;
         }
 
--- a/browser/base/content/sync/aboutSyncTabs.js
+++ b/browser/base/content/sync/aboutSyncTabs.js
@@ -168,17 +168,17 @@ var RemoteTabViewer = {
     this._buildListRequested = false;
 
     this._clearTabList();
 
     if (Weave.Service.isLoggedIn) {
       this._refetchTabs(forceSync);
       this._generateWeaveTabList();
     } else {
-      //XXXzpao We should say something about not being logged in & not having data
+      // XXXzpao We should say something about not being logged in & not having data
       //        or tell the appropriate condition. (bug 583344)
     }
 
     let complete = () => {
       this._waitingForBuildList = false;
       if (this._buildListRequested) {
         CommonUtils.nextTick(this.buildList, this);
       }
--- a/browser/base/content/sync/setup.js
+++ b/browser/base/content/sync/setup.js
@@ -67,17 +67,17 @@ var gSyncSetup = {
       ["weave:service:login:start",       "onLoginStart"],
       ["weave:service:login:error",       "onLoginEnd"],
       ["weave:service:login:finish",      "onLoginEnd"]];
 
     // Add the observers now and remove them on unload
     let self = this;
     let addRem = function(add) {
       obs.forEach(function([topic, func]) {
-        //XXXzpao This should use Services.obs.* but Weave's Obs does nice handling
+        // XXXzpao This should use Services.obs.* but Weave's Obs does nice handling
         //        of `this`. Fix in a followup. (bug 583347)
         if (add)
           Weave.Svc.Obs.add(topic, self[func], self);
         else
           Weave.Svc.Obs.remove(topic, self[func], self);
       });
     };
     addRem(true);
@@ -1023,17 +1023,17 @@ var gSyncSetup = {
     if ((stateFlags & Ci.nsIWebProgressListener.STATE_IS_NETWORK) == 0)
       return;
     if ((stateFlags & Ci.nsIWebProgressListener.STATE_IS_WINDOW) == 0)
       return;
 
     // If we didn't find a captcha, assume it's not needed and don't show it.
     let responseStatus = request.QueryInterface(Ci.nsIHttpChannel).responseStatus;
     setVisibility(this.captchaBrowser, responseStatus != 404);
-    //XXX TODO we should really log any responseStatus other than 200
+    // XXX TODO we should really log any responseStatus other than 200
   },
   onProgressChange: function() {},
   onStatusChange: function() {},
   onSecurityChange: function() {},
   onLocationChange: function () {}
 };
 
 // Define lazy getters for various XUL elements.
--- a/browser/base/content/test/general/browser_aboutAccounts.js
+++ b/browser/base/content/test/general/browser_aboutAccounts.js
@@ -1,13 +1,13 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-///////////////////
+// /////////////////
 //
 // Whitelisting this test.
 // As part of bug 1077403, the leaking uncaught rejection should be fixed.
 //
 thisTestLeaksUncaughtRejectionsAndShouldBeFixed("TypeError: window.location is null");
 
 XPCOMUtils.defineLazyModuleGetter(this, "Promise",
   "resource://gre/modules/Promise.jsm");
--- a/browser/base/content/test/general/browser_aboutSupport_newtab_security_state.js
+++ b/browser/base/content/test/general/browser_aboutSupport_newtab_security_state.js
@@ -1,12 +1,12 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-///////////////////
+// /////////////////
 //
 // Whitelisting this test.
 // As part of bug 1077403, the leaking uncaught rejection should be fixed.
 //
 thisTestLeaksUncaughtRejectionsAndShouldBeFixed("TypeError: window.location is null");
 
 
 add_task(function* checkIdentityOfAboutSupport() {
--- a/browser/base/content/test/general/browser_bug416661.js
+++ b/browser/base/content/test/general/browser_bug416661.js
@@ -1,15 +1,15 @@
 var tabElm, zoomLevel;
 function start_test_prefNotSet() {
   Task.spawn(function* () {
     is(ZoomManager.zoom, 1, "initial zoom level should be 1");
     FullZoom.enlarge();
 
-    //capture the zoom level to test later
+    // capture the zoom level to test later
     zoomLevel = ZoomManager.zoom;
     isnot(zoomLevel, 1, "zoom level should have changed");
 
     yield FullZoomHelper.load(gBrowser.selectedTab, "http://mochi.test:8888/browser/browser/base/content/test/general/moz.png");
   }).then(continue_test_prefNotSet, FullZoomHelper.failAndContinue(finish));
 }
 
 function continue_test_prefNotSet () {
--- a/browser/base/content/test/general/browser_bug767836_perwindowpb.js
+++ b/browser/base/content/test/general/browser_bug767836_perwindowpb.js
@@ -2,17 +2,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 /* globals waitForExplicitFinish, executeSoon, finish, whenNewWindowLoaded, ok */
 /* globals is */
 /* exported test */
 
 function test() {
-  //initialization
+  // initialization
   waitForExplicitFinish();
 
   let aboutNewTabService = Components.classes["@mozilla.org/browser/aboutnewtab-service;1"]
                                      .getService(Components.interfaces.nsIAboutNewTabService);
   let newTabURL;
   let testURL = "http://example.com/";
   let defaultURL = aboutNewTabService.newTabURL;
   let mode;
--- a/browser/base/content/test/general/browser_bug822367.js
+++ b/browser/base/content/test/general/browser_bug822367.js
@@ -55,17 +55,17 @@ function MixedTest1B() {
   waitForCondition(() => content.document.getElementById('p1').innerHTML == "hello", MixedTest1C, "Waited too long for mixed script to run in Test 1");
 }
 function MixedTest1C() {
   ok(content.document.getElementById('p1').innerHTML == "hello", "Mixed script didn't load in Test 1");
   gTestBrowser.removeEventListener("load", MixedTest1B, true);
   MixedTest2();
 }
 
-//Mixed Display Test - Doorhanger should not appear
+// Mixed Display Test - Doorhanger should not appear
 function MixedTest2() {
   gTestBrowser.addEventListener("load", MixedTest2A, true);
   var url = gHttpTestRoot2 + "file_bug822367_2.html";
   gTestBrowser.contentWindow.location = url;
 }
 
 function MixedTest2A() {
   assertMixedContentBlockingState(gTestBrowser, {activeLoaded: false, activeBlocked: false, passiveLoaded: false});
--- a/browser/base/content/test/general/browser_bug902156.js
+++ b/browser/base/content/test/general/browser_bug902156.js
@@ -37,17 +37,17 @@ registerCleanupFunction(function() {
 });
 
 function cleanUpAfterTests() {
   gBrowser.removeCurrentTab();
   window.focus();
   finish();
 }
 
-//------------------------ Test 1 ------------------------------
+// ------------------------ Test 1 ------------------------------
 
 function test1A() {
   BrowserTestUtils.browserLoaded(gTestBrowser).then(test1B);
 
   assertMixedContentBlockingState(gTestBrowser, {activeLoaded: false, activeBlocked: true, passiveLoaded: false});
 
   // Disable Mixed Content Protection for the page (and reload)
   let {gIdentityHandler} = gTestBrowser.ownerGlobal;
@@ -80,17 +80,17 @@ function test1D() {
 
   var actual = content.document.getElementById('mctestdiv').innerHTML;
   is(actual, "Mixed Content Blocker disabled", "OK: Executed mixed script in Test 1D");
 
   // move on to Test 2
   test2();
 }
 
-//------------------------ Test 2 ------------------------------
+// ------------------------ Test 2 ------------------------------
 
 function test2() {
   BrowserTestUtils.browserLoaded(gTestBrowser).then(test2A);
   var url = gHttpTestRoot2 + "file_bug902156_2.html";
   gTestBrowser.loadURI(url);
 }
 
 function test2A() {
@@ -130,32 +130,32 @@ function test2D() {
 
   var actual = content.document.getElementById('mctestdiv').innerHTML;
   is(actual, "Mixed Content Blocker disabled", "OK: Executed mixed script in Test 2D");
 
   // move on to Test 3
   test3();
 }
 
-//------------------------ Test 3 ------------------------------
+// ------------------------ Test 3 ------------------------------
 
 function test3() {
   BrowserTestUtils.browserLoaded(gTestBrowser).then(test3A);
   var url = gHttpTestRoot1 + "file_bug902156_3.html";
   gTestBrowser.loadURI(url);
 }
 
 function test3A() {
   assertMixedContentBlockingState(gTestBrowser, {activeLoaded: false, activeBlocked: true, passiveLoaded: false});
 
   // We are done with tests, clean up
   cleanUpAfterTests();
 }
 
-//------------------------------------------------------
+// ------------------------------------------------------
 
 function test() {
   // Performing async calls, e.g. 'onload', we have to wait till all of them finished
   waitForExplicitFinish();
 
   // Store original preferences so we can restore settings after testing
   origBlockActive = Services.prefs.getBoolPref(PREF_ACTIVE);
 
--- a/browser/base/content/test/general/browser_contextmenu.js
+++ b/browser/base/content/test/general/browser_contextmenu.js
@@ -756,17 +756,17 @@ add_task(function* test_select_input_tex
      "context-cut",         true,
      "context-copy",        true,
      "context-paste",       null, // ignore clipboard state
      "context-delete",      true,
      "---",                 null,
      "context-selectall",   true,
      "---",                 null,
      "spell-check-enabled", true,
-     //spell checker is shown on input[type="password"] on this testcase
+     // spell checker is shown on input[type="password"] on this testcase
      "spell-dictionaries",  true,
          ["spell-check-dictionary-en-US", true,
           "---",                          null,
           "spell-add-dictionaries",       true], null
     ].concat(LOGIN_FILL_ITEMS),
     {
       *preCheckContextMenuFn() {
         yield ContentTask.spawn(gBrowser.selectedBrowser, null, function*() {
--- a/browser/base/content/test/general/browser_csp_block_all_mixedcontent.js
+++ b/browser/base/content/test/general/browser_csp_block_all_mixedcontent.js
@@ -4,51 +4,51 @@
  * The page tries to load a script over http. We make sure the UI is not
  * influenced when blocking the mixed content. In particular the page
  * should still appear fully encrypted with a green lock.
  */
 
 const PRE_PATH = "https://example.com/browser/browser/base/content/test/general/";
 var gTestBrowser = null;
 
-//------------------------------------------------------
+// ------------------------------------------------------
 function cleanUpAfterTests() {
   gBrowser.removeCurrentTab();
   window.focus();
   finish();
 }
 
-//------------------------------------------------------
+// ------------------------------------------------------
 function verifyUInotDegraded() {
   // make sure that not mixed content is loaded and also not blocked
   assertMixedContentBlockingState(
     gTestBrowser,
     { activeLoaded: false,
       activeBlocked: false,
       passiveLoaded: false
     }
   );
   // clean up and finish test
   cleanUpAfterTests();
 }
 
-//------------------------------------------------------
+// ------------------------------------------------------
 function runTests() {
   var newTab = gBrowser.addTab();
   gBrowser.selectedTab = newTab;
   gTestBrowser = gBrowser.selectedBrowser;
   newTab.linkedBrowser.stop();
 
   // Starting the test
   BrowserTestUtils.browserLoaded(gTestBrowser).then(verifyUInotDegraded);
   var url = PRE_PATH + "file_csp_block_all_mixedcontent.html";
   gTestBrowser.loadURI(url);
 }
 
-//------------------------------------------------------
+// ------------------------------------------------------
 function test() {
   // Performing async calls, e.g. 'onload', we have to wait till all of them finished
   waitForExplicitFinish();
 
   SpecialPowers.pushPrefEnv(
     { 'set': [["security.mixed_content.block_active_content", true]] },
     function() { runTests(); }
   );
--- a/browser/base/content/test/general/browser_double_close_tab.js
+++ b/browser/base/content/test/general/browser_double_close_tab.js
@@ -34,17 +34,17 @@ function waitForDialogDestroyed(node, ca
     observer = null;
     callback();
   }
 }
 
 add_task(function*() {
   testTab = gBrowser.selectedTab = gBrowser.addTab();
   yield promiseTabLoadEvent(testTab, TEST_PAGE);
-  //XXXgijs the reason this has nesting and callbacks rather than promises is
+  // XXXgijs the reason this has nesting and callbacks rather than promises is
   // that DOM promises resolve on the next tick. So they're scheduled
   // in an event queue. So when we spin a new event queue for a modal dialog...
   // everything gets messed up and the promise's .then callbacks never get
   // called, despite resolve() being called just fine.
   let dialogNode = yield new Promise(resolveOuter => {
     waitForDialog(dialogNode => {
       waitForDialogDestroyed(dialogNode, () => {
         let doCompletion = () => setTimeout(resolveOuter, 0);
--- a/browser/base/content/test/general/browser_fxa_oauth.js
+++ b/browser/base/content/test/general/browser_fxa_oauth.js
@@ -1,13 +1,13 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-///////////////////
+// /////////////////
 //
 // Whitelisting this test.
 // As part of bug 1077403, the leaking uncaught rejection should be fixed.
 //
 thisTestLeaksUncaughtRejectionsAndShouldBeFixed("TypeError: this.docShell is null");
 
 Cu.import("resource://gre/modules/Promise.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
--- a/browser/base/content/test/general/browser_fxaccounts.js
+++ b/browser/base/content/test/general/browser_fxaccounts.js
@@ -170,17 +170,17 @@ function isFooterVisible() {
 
 function configureProfileURL(profile, responseStatus = 200) {
   let responseBody = profile ? JSON.stringify(profile) : "";
   let url = TEST_ROOT + "fxa_profile_handler.sjs?" +
             "responseStatus=" + responseStatus +
             "responseBody=" + responseBody +
             // This is a bit cheeky - the FxA code will just append "/profile"
             // to the preference value. We arrange for this to be seen by our
-            //.sjs as part of the query string.
+            // .sjs as part of the query string.
             "&path=";
 
   Services.prefs.setCharPref("identity.fxaccounts.remote.profile.uri", url);
 }
 
 function promiseObserver(topic, count = 1) {
   return new Promise(resolve => {
     let obs = (subject, topic, data) => {
--- a/browser/base/content/test/general/browser_gZipOfflineChild.js
+++ b/browser/base/content/test/general/browser_gZipOfflineChild.js
@@ -11,17 +11,17 @@ registerCleanupFunction(function() {
   let principal = Services.scriptSecurityManager.createCodebasePrincipal(uri, {});
   Services.perms.removeFromPrincipal(principal, "offline-app");
   Services.prefs.clearUserPref("offline-apps.allow_by_default");
 });
 
 var cacheCount = 0;
 var intervalID = 0;
 
-////
+// //
 // Handle "message" events which are posted from the iframe upon
 // offline cache events.
 //
 function handleMessageEvents(event) {
   cacheCount++;
   switch (cacheCount) {
     case 1:
       // This is the initial caching off offline data.
--- a/browser/base/content/test/general/browser_mcb_redirect.js
+++ b/browser/base/content/test/general/browser_mcb_redirect.js
@@ -57,17 +57,17 @@ const PREF_ACTIVE = "security.mixed_cont
 const PREF_DISPLAY = "security.mixed_content.block_display_content";
 const gHttpsTestRoot = "https://example.com/browser/browser/base/content/test/general/";
 const gHttpTestRoot = "http://example.com/browser/browser/base/content/test/general/";
 
 var origBlockActive;
 var origBlockDisplay;
 var gTestBrowser = null;
 
-//------------------------ Helper Functions ---------------------
+// ------------------------ Helper Functions ---------------------
 
 registerCleanupFunction(function() {
   // Set preferences back to their original values
   Services.prefs.setBoolPref(PREF_ACTIVE, origBlockActive);
   Services.prefs.setBoolPref(PREF_DISPLAY, origBlockDisplay);
 
   // Make sure we are online again
   Services.io.offline = false;
@@ -92,17 +92,17 @@ function waitForCondition(condition, nex
     }
     tries++;
   }, 500);
   var moveOn = function() {
     clearInterval(interval); nextTest();
   };
 }
 
-//------------------------ Test 1 ------------------------------
+// ------------------------ Test 1 ------------------------------
 
 function test1() {
   gTestBrowser.addEventListener("load", checkUIForTest1, true);
   var url = gHttpsTestRoot + "test_mcb_redirect.html"
   gTestBrowser.contentWindow.location = url;
 }
 
 function checkUIForTest1() {
@@ -112,17 +112,17 @@ function checkUIForTest1() {
 
   var expected = "script blocked";
   waitForCondition(
     () => content.document.getElementById('mctestdiv').innerHTML == expected,
     test2, "Error: Waited too long for status in Test 1!",
     "OK: Expected result in innerHTML for Test1!");
 }
 
-//------------------------ Test 2 ------------------------------
+// ------------------------ Test 2 ------------------------------
 
 function test2() {
   gTestBrowser.addEventListener("load", checkUIForTest2, true);
   var url = gHttpTestRoot + "test_mcb_redirect.html"
   gTestBrowser.contentWindow.location = url;
 }
 
 function checkUIForTest2() {
@@ -132,17 +132,17 @@ function checkUIForTest2() {
 
   var expected = "script executed";
   waitForCondition(
     () => content.document.getElementById('mctestdiv').innerHTML == expected,
     test3, "Error: Waited too long for status in Test 2!",
     "OK: Expected result in innerHTML for Test2!");
 }
 
-//------------------------ Test 3 ------------------------------
+// ------------------------ Test 3 ------------------------------
 // HTTPS page loading insecure image
 function test3() {
   gTestBrowser.addEventListener("load", checkLoadEventForTest3, true);
   var url = gHttpsTestRoot + "test_mcb_redirect_image.html"
   gTestBrowser.contentWindow.location = url;
 }
 
 function checkLoadEventForTest3() {
@@ -150,17 +150,17 @@ function checkLoadEventForTest3() {
 
   var expected = "image blocked"
   waitForCondition(
     () => content.document.getElementById('mctestdiv').innerHTML == expected,
     test4, "Error: Waited too long for status in Test 3!",
     "OK: Expected result in innerHTML for Test3!");
 }
 
-//------------------------ Test 4 ------------------------------
+// ------------------------ Test 4 ------------------------------
 // HTTP page loading insecure image
 function test4() {
   gTestBrowser.addEventListener("load", checkLoadEventForTest4, true);
   var url = gHttpTestRoot + "test_mcb_redirect_image.html"
   gTestBrowser.contentWindow.location = url;
 }
 
 function checkLoadEventForTest4() {
@@ -168,17 +168,17 @@ function checkLoadEventForTest4() {
 
   var expected = "image loaded"
   waitForCondition(
     () => content.document.getElementById('mctestdiv').innerHTML == expected,
     test5, "Error: Waited too long for status in Test 4!",
     "OK: Expected result in innerHTML for Test4!");
 }
 
-//------------------------ Test 5 ------------------------------
+// ------------------------ Test 5 ------------------------------
 // HTTP page laoding insecure cached image
 // Assuming test 4 succeeded, the image has already been loaded once
 // and hence should be cached per the sjs cache-control header
 // Going into offline mode to ensure we are loading from the cache.
 function test5() {
   gTestBrowser.addEventListener("load", checkLoadEventForTest5, true);
   // Go into offline mode
   Services.io.offline = true;
@@ -193,17 +193,17 @@ function checkLoadEventForTest5() {
   waitForCondition(
     () => content.document.getElementById('mctestdiv').innerHTML == expected,
     test6, "Error: Waited too long for status in Test 5!",
     "OK: Expected result in innerHTML for Test5!");
   // Go back online
   Services.io.offline = false;
 }
 
-//------------------------ Test 6 ------------------------------
+// ------------------------ Test 6 ------------------------------
 // HTTPS page loading insecure cached image
 // Assuming test 4 succeeded, the image has already been loaded once
 // and hence should be cached per the sjs cache-control header
 // Going into offline mode to ensure we are loading from the cache.
 function test6() {
   gTestBrowser.addEventListener("load", checkLoadEventForTest6, true);
   // Go into offline mode
   Services.io.offline = true;
@@ -218,17 +218,17 @@ function checkLoadEventForTest6() {
   waitForCondition(
     () => content.document.getElementById('mctestdiv').innerHTML == expected,
     test7, "Error: Waited too long for status in Test 6!",
     "OK: Expected result in innerHTML for Test6!");
   // Go back online
   Services.io.offline = false;
 }
 
-//------------------------ Test 7 ------------------------------
+// ------------------------ Test 7 ------------------------------
 // HTTP page loading insecure image that went through a double redirect
 function test7() {
   gTestBrowser.addEventListener("load", checkLoadEventForTest7, true);
   var url = gHttpTestRoot + "test_mcb_double_redirect_image.html"
   gTestBrowser.contentWindow.location = url;
 }
 
 function checkLoadEventForTest7() {
@@ -236,17 +236,17 @@ function checkLoadEventForTest7() {
 
   var expected = "image loaded"
   waitForCondition(
     () => content.document.getElementById('mctestdiv').innerHTML == expected,
     test8, "Error: Waited too long for status in Test 7!",
     "OK: Expected result in innerHTML for Test7!");
 }
 
-//------------------------ Test 8 ------------------------------
+// ------------------------ Test 8 ------------------------------
 // HTTP page loading insecure cached image that went through a double redirect
 // Assuming test 7 succeeded, the image has already been loaded once
 // and hence should be cached per the sjs cache-control header
 // Going into offline mode to ensure we are loading from the cache.
 function test8() {
   gTestBrowser.addEventListener("load", checkLoadEventForTest8, true);
   // Go into offline mode
   Services.io.offline = true;
@@ -261,17 +261,17 @@ function checkLoadEventForTest8() {
   waitForCondition(
     () => content.document.getElementById('mctestdiv').innerHTML == expected,
     test9, "Error: Waited too long for status in Test 8!",
     "OK: Expected result in innerHTML for Test8!");
   // Go back online
   Services.io.offline = false;
 }
 
-//------------------------ Test 9 ------------------------------
+// ------------------------ Test 9 ------------------------------
 // HTTPS page loading insecure cached image that went through a double redirect
 // Assuming test 7 succeeded, the image has already been loaded once
 // and hence should be cached per the sjs cache-control header
 // Going into offline mode to ensure we are loading from the cache.
 function test9() {
   gTestBrowser.addEventListener("load", checkLoadEventForTest9, true);
   // Go into offline mode
   Services.io.offline = true;
@@ -286,17 +286,17 @@ function checkLoadEventForTest9() {
   waitForCondition(
     () => content.document.getElementById('mctestdiv').innerHTML == expected,
     cleanUpAfterTests, "Error: Waited too long for status in Test 9!",
     "OK: Expected result in innerHTML for Test9!");
   // Go back online
   Services.io.offline = false;
 }
 
-//------------------------ SETUP ------------------------------
+// ------------------------ SETUP ------------------------------
 
 function test() {
   // Performing async calls, e.g. 'onload', we have to wait till all of them finished
   waitForExplicitFinish();
 
   // Store original preferences so we can restore settings after testing
   origBlockActive = Services.prefs.getBoolPref(PREF_ACTIVE);
   origBlockDisplay = Services.prefs.getBoolPref(PREF_DISPLAY);
--- a/browser/base/content/test/general/browser_no_mcb_on_http_site.js
+++ b/browser/base/content/test/general/browser_no_mcb_on_http_site.js
@@ -56,17 +56,17 @@ function waitForCondition(condition, nex
     }
     tries++;
   }, 100);
   var moveOn = function() {
     clearInterval(interval); nextTest();
   };
 }
 
-//------------- TEST 1 -----------------------------------------
+// ------------- TEST 1 -----------------------------------------
 
 function test1A() {
   gTestBrowser.removeEventListener("load", test1A, true);
 
   var expected = "Verifying MCB does not trigger warning/error for an http page ";
   expected += "with https css that includes http image";
   waitForCondition(
     () => content.document.getElementById('testDiv').innerHTML == expected,
@@ -76,17 +76,17 @@ function test1A() {
 
 function test1B() {
   // set up test 2
   gTestBrowser.addEventListener("load", test2A, true);
   var url = gHttpTestRoot + "test_no_mcb_on_http_site_font.html";
   gTestBrowser.contentWindow.location = url;
 }
 
-//------------- TEST 2 -----------------------------------------
+// ------------- TEST 2 -----------------------------------------
 
 function test2A() {
   gTestBrowser.removeEventListener("load", test2A, true);
 
   var expected = "Verifying MCB does not trigger warning/error for an http page ";
   expected += "with https css that includes http font";
   waitForCondition(
     () => content.document.getElementById('testDiv').innerHTML == expected,
@@ -96,30 +96,30 @@ function test2A() {
 
 function test2B() {
   // set up test 3
   gTestBrowser.addEventListener("load", test3, true);
   var url = gHttpTestRoot + "test_no_mcb_on_http_site_font2.html";
   gTestBrowser.contentWindow.location = url;
 }
 
-//------------- TEST 3 -----------------------------------------
+// ------------- TEST 3 -----------------------------------------
 
 function test3() {
   gTestBrowser.removeEventListener("load", test3, true);
 
   var expected = "Verifying MCB does not trigger warning/error for an http page "
   expected += "with https css that imports another http css which includes http font";
   waitForCondition(
     () => content.document.getElementById('testDiv').innerHTML == expected,
     cleanUpAfterTests, "Error: Waited too long for status in Test 3!",
     "OK: Expected result in innerHTML!");
 }
 
-//------------------------------------------------------
+// ------------------------------------------------------
 
 function test() {
   // Performing async calls, e.g. 'onload', we have to wait till all of them finished
   waitForExplicitFinish();
 
   // Store original preferences so we can restore settings after testing
   origBlockActive = Services.prefs.getBoolPref(PREF_ACTIVE);
   origBlockDisplay = Services.prefs.getBoolPref(PREF_DISPLAY);
--- a/browser/base/content/test/general/browser_sanitizeDialog.js
+++ b/browser/base/content/test/general/browser_sanitizeDialog.js
@@ -628,17 +628,17 @@ add_task(function* test_offline_apps_per
   };
   wh.open();
   yield wh.promiseClosed;
 });
 
 var now_mSec = Date.now();
 var now_uSec = now_mSec * 1000;
 
-///////////////////////////////////////////////////////////////////////////////
+// /////////////////////////////////////////////////////////////////////////////
 
 /**
  * This wraps the dialog and provides some convenience methods for interacting
  * with it.
  *
  * @param aWin
  *        The dialog's nsIDOMWindow
  */
--- a/browser/base/content/test/general/browser_scope.js
+++ b/browser/base/content/test/general/browser_scope.js
@@ -1,9 +1,9 @@
-///////////////////
+// /////////////////
 //
 // Whitelisting this test.
 // As part of bug 1077403, the leaking uncaught rejection should be fixed.
 //
 thisTestLeaksUncaughtRejectionsAndShouldBeFixed("TypeError: this.docShell is null");
 
 function test() {
   ok(!!gBrowser, "gBrowser exists");
--- a/browser/base/content/test/general/browser_tabs_owner.js
+++ b/browser/base/content/test/general/browser_tabs_owner.js
@@ -1,16 +1,16 @@
-///////////////////
+// /////////////////
 //
 // Whitelisting this test.
 // As part of bug 1077403, the leaking uncaught rejection should be fixed.
 //
 thisTestLeaksUncaughtRejectionsAndShouldBeFixed("TypeError: gBrowser._finalizeTabSwitch is not a function");
 
-///////////////////
+// /////////////////
 //
 // Whitelisting this test.
 // As part of bug 1077403, the leaking uncaught rejection should be fixed.
 //
 thisTestLeaksUncaughtRejectionsAndShouldBeFixed("TypeError: gBrowser._finalizeTabSwitch is not a function");
 
 function test() {
   gBrowser.addTab();
--- a/browser/base/content/test/general/contextmenu_common.js
+++ b/browser/base/content/test/general/contextmenu_common.js
@@ -181,17 +181,17 @@ function checkMenuItem(actualItem, actua
  *               "submenu", null,           // submenu
  *                   ["sub1", true,         // submenu contents
  *                    "sub2", false], null, // submenu contents
  *               "lol", false]              // item disabled
  *
  */
 function checkMenu(menu, expectedItems, data) {
     var actualItems = getVisibleMenuItems(menu, data);
-    //ok(false, "Items are: " + actualItems);
+    // ok(false, "Items are: " + actualItems);
     for (var i = 0; i < expectedItems.length; i+=2) {
         var actualItem   = actualItems[i];
         var actualEnabled = actualItems[i + 1];
         var expectedItem = expectedItems[i];
         var expectedEnabled = expectedItems[i + 1];
         if (expectedItem instanceof Array) {
             ok(true, "Checking submenu/menugroup...");
             var previousId = expectedItems[i - 2]; // The last item was the menu ID.
--- a/browser/base/content/test/social/browser_blocklist.js
+++ b/browser/base/content/test/social/browser_blocklist.js
@@ -56,17 +56,17 @@ function test() {
   waitForExplicitFinish();
   // turn on logging for nsBlocklistService.js
   Services.prefs.setBoolPref("extensions.logging.enabled", true);
   registerCleanupFunction(function () {
     Services.prefs.clearUserPref("extensions.logging.enabled");
   });
 
   runSocialTests(tests, undefined, undefined, function () {
-    resetBlocklist().then(finish); //restore to original pref
+    resetBlocklist().then(finish); // restore to original pref
   });
 }
 
 var tests = {
   testSimpleBlocklist: function(next) {
     // this really just tests adding and clearing our blocklist for later tests
     setAndUpdateBlocklist(blocklistURL).then(() => {
       ok(Services.blocklist.isAddonBlocklisted(SocialService.createWrapper(manifest_bad)), "blocking 'blocked'");
--- a/browser/base/content/test/social/browser_share.js
+++ b/browser/base/content/test/social/browser_share.js
@@ -65,21 +65,21 @@ function test() {
 var corpus = [
   {
     url: baseURL+"opengraph/opengraph.html",
     options: {
       // og:title
       title: ">This is my title<",
       // og:description
       description: "A test corpus file for open graph tags we care about",
-      //medium: this.getPageMedium(),
-      //source: this.getSourceURL(),
+      // medium: this.getPageMedium(),
+      // source: this.getSourceURL(),
       // og:url
       url: "https://www.mozilla.org/",
-      //shortUrl: this.getShortURL(),
+      // shortUrl: this.getShortURL(),
       // og:image
       previews:["https://www.mozilla.org/favicon.png"],
       // og:site_name
       siteName: ">My simple test page<"
     }
   },
   {
     // tests that og:url doesn't override the page url if it is bad
--- a/browser/base/content/test/social/browser_social_activation.js
+++ b/browser/base/content/test/social/browser_social_activation.js
@@ -1,13 +1,13 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-///////////////////
+// /////////////////
 //
 // Whitelisting this test.
 // As part of bug 1077403, the leaking uncaught rejection should be fixed.
 //
 thisTestLeaksUncaughtRejectionsAndShouldBeFixed("TypeError: Assert is null");
 
 
 var SocialService = Cu.import("resource:///modules/SocialService.jsm", {}).SocialService;
--- a/browser/base/content/test/urlbar/browser_bug623155.js
+++ b/browser/base/content/test/urlbar/browser_bug623155.js
@@ -64,21 +64,21 @@ var gWebProgressListener = {
         aIID.equals(Components.interfaces.nsISupports))
       return this;
     throw Components.results.NS_NOINTERFACE;
   },
 
   // ---------------------------------------------------------------------------
   // NOTIFY_LOCATION mode should work fine without these methods.
   //
-  //onStateChange: function() {},
-  //onStatusChange: function() {},
-  //onProgressChange: function() {},
-  //onSecurityChange: function() {},
-  //----------------------------------------------------------------------------
+  // onStateChange: function() {},
+  // onStatusChange: function() {},
+  // onProgressChange: function() {},
+  // onSecurityChange: function() {},
+  // ----------------------------------------------------------------------------
 
   onLocationChange: function(aWebProgress, aRequest, aLocation, aFlags) {
     if (!aRequest) {
       // This is bug 673752, or maybe initial "about:blank".
       return;
     }
 
     ok(gNewTab, "There is a new tab.");
--- a/browser/base/content/utilityOverlay.js
+++ b/browser/base/content/utilityOverlay.js
@@ -287,24 +287,24 @@ function openLinkIn(url, where, params) 
     var referrerPolicySupports = Cc["@mozilla.org/supports-PRUint32;1"].
                                  createInstance(Ci.nsISupportsPRUint32);
     referrerPolicySupports.data = aReferrerPolicy;
 
     var userContextIdSupports = Cc["@mozilla.org/supports-PRUint32;1"].
                                  createInstance(Ci.nsISupportsPRUint32);
     userContextIdSupports.data = aUserContextId;
 
-    sa.appendElement(wuri, /*weak =*/ false);
-    sa.appendElement(charset, /*weak =*/ false);
-    sa.appendElement(referrerURISupports, /*weak =*/ false);
-    sa.appendElement(aPostData, /*weak =*/ false);
-    sa.appendElement(allowThirdPartyFixupSupports, /*weak =*/ false);
-    sa.appendElement(referrerPolicySupports, /*weak =*/ false);
-    sa.appendElement(userContextIdSupports, /*weak =*/ false);
-    sa.appendElement(aPrincipal, /*weak =*/ false);
+    sa.appendElement(wuri, /* weak =*/ false);
+    sa.appendElement(charset, /* weak =*/ false);
+    sa.appendElement(referrerURISupports, /* weak =*/ false);
+    sa.appendElement(aPostData, /* weak =*/ false);
+    sa.appendElement(allowThirdPartyFixupSupports, /* weak =*/ false);
+    sa.appendElement(referrerPolicySupports, /* weak =*/ false);
+    sa.appendElement(userContextIdSupports, /* weak =*/ false);
+    sa.appendElement(aPrincipal, /* weak =*/ false);
 
     let features = "chrome,dialog=no,all";
     if (aIsPrivate) {
       features += ",private";
     }
 
     Services.ww.openWindow(w || window, getBrowserURL(), null, features, sa);
     return;
@@ -684,17 +684,17 @@ function openPreferences(paneID, extraAr
   if (!win) {
     const Cc = Components.classes;
     const Ci = Components.interfaces;
     let windowArguments = Cc["@mozilla.org/array;1"]
                             .createInstance(Ci.nsIMutableArray);
     let supportsStringPrefURL = Cc["@mozilla.org/supports-string;1"]
                                   .createInstance(Ci.nsISupportsString);
     supportsStringPrefURL.data = preferencesURL;
-    windowArguments.appendElement(supportsStringPrefURL, /*weak =*/ false);
+    windowArguments.appendElement(supportsStringPrefURL, /* weak =*/ false);
 
     win = Services.ww.openWindow(null, Services.prefs.getCharPref("browser.chromeURL"),
                                  "_blank", "chrome,dialog=no,all", windowArguments);
   } else {
     let shouldReplaceFragment = friendlyCategoryName ? "whenComparingAndReplace" : "whenComparing";
     newLoad = !win.switchToTabHavingURI(preferencesURL, true, { ignoreFragment: shouldReplaceFragment, replaceQueryString: true });
     browser = win.gBrowser.selectedBrowser;
   }
--- a/browser/base/content/web-panels.js
+++ b/browser/base/content/web-panels.js
@@ -18,17 +18,17 @@ var panelProgressListener = {
                                  aCurTotalProgress, aMaxTotalProgress) {
     },
 
     onStateChange : function(aWebProgress, aRequest, aStateFlags, aStatus)
     {
         if (!aRequest)
           return;
 
-        //ignore local/resource:/chrome: files
+        // ignore local/resource:/chrome: files
         if (aStatus == NS_NET_STATUS_READ_FROM || aStatus == NS_NET_STATUS_WROTE_TO)
            return;
 
         if (aStateFlags & Ci.nsIWebProgressListener.STATE_START &&
             aStateFlags & Ci.nsIWebProgressListener.STATE_IS_NETWORK) {
             window.parent.document.getElementById('sidebar-throbber').setAttribute("loading", "true");
         }
         else if (aStateFlags & Ci.nsIWebProgressListener.STATE_STOP &&
--- a/browser/components/customizableui/CustomizableUI.jsm
+++ b/browser/components/customizableui/CustomizableUI.jsm
@@ -88,17 +88,17 @@ var gPlacements = new Map();
 
 /**
  * gFuturePlacements represent placements that will happen for areas that have
  * not yet loaded (due to lazy-loading). This can occur when add-ons register
  * widgets.
  */
 var gFuturePlacements = new Map();
 
-//XXXunf Temporary. Need a nice way to abstract functions to build widgets
+// XXXunf Temporary. Need a nice way to abstract functions to build widgets
 //       of these types.
 var gSupportedWidgetTypes = new Set(["button", "view", "custom"]);
 
 /**
  * gPanelsForWindow is a list of known panels in a window which we may need to close
  * should command events fire which target them.
  */
 var gPanelsForWindow = new WeakMap();
@@ -492,17 +492,17 @@ var CustomizableUIInternal = {
     let areaIsKnown = gAreas.has(aName);
     let props = areaIsKnown ? gAreas.get(aName) : new Map();
     const kImmutableProperties = new Set(["type", "legacy", "overflowable"]);
     for (let key in aProperties) {
       if (areaIsKnown && kImmutableProperties.has(key) &&
           props.get(key) != aProperties[key]) {
         throw new Error("An area cannot change the property for '" + key + "'");
       }
-      //XXXgijs for special items, we need to make sure they have an appropriate ID
+      // XXXgijs for special items, we need to make sure they have an appropriate ID
       // so we aren't perpetually in a non-default state:
       if (key == "defaultPlacements" && Array.isArray(aProperties[key])) {
         props.set(key, aProperties[key].map(x => this.isSpecialWidget(x) ? this.ensureSpecialWidgetId(x) : x ));
       } else {
         props.set(key, aProperties[key]);
       }
     }
     // Default to a toolbar:
@@ -1488,17 +1488,17 @@ var CustomizableUIInternal = {
     if (aWidget.type == "button") {
       if (aWidget.onCommand) {
         try {
           aWidget.onCommand.call(null, aEvent);
         } catch (e) {
           log.error(e);
         }
       } else {
-        //XXXunf Need to think this through more, and formalize.
+        // XXXunf Need to think this through more, and formalize.
         Services.obs.notifyObservers(aNode,
                                      "customizedui-widget-command",
                                      aWidget.id);
       }
     } else if (aWidget.type == "view") {
       let ownerWindow = aNode.ownerGlobal;
       let area = this.getPlacementOfWidget(aNode.id).area;
       let anchor = aNode;
@@ -1517,17 +1517,17 @@ var CustomizableUIInternal = {
     log.debug("handleWidgetClick");
     if (aWidget.onClick) {
       try {
         aWidget.onClick.call(null, aEvent);
       } catch (e) {
         Cu.reportError(e);
       }
     } else {
-      //XXXunf Need to think this through more, and formalize.
+      // XXXunf Need to think this through more, and formalize.
       Services.obs.notifyObservers(aNode, "customizedui-widget-click", aWidget.id);
     }
   },
 
   _getPanelForNode: function(aNode) {
     let panel = aNode;
     while (panel && panel.localName != "panel")
       panel = panel.parentNode;
@@ -2140,17 +2140,17 @@ var CustomizableUIInternal = {
     }
     for (let [win, ] of gBuildWindows) {
       this._dispatchToolboxEventToWindow(aEventType, aDetails, win);
     }
   },
 
   createWidget: function(aProperties) {
     let widget = this.normalizeWidget(aProperties, CustomizableUI.SOURCE_EXTERNAL);
-    //XXXunf This should probably throw.
+    // XXXunf This should probably throw.
     if (!widget) {
       log.error("unable to normalize widget");
       return undefined;
     }
 
     gPalette.set(widget.id, widget);
 
     // Clear our caches:
@@ -2297,17 +2297,17 @@ var CustomizableUIInternal = {
   // Returns true if the area will eventually lazily restore (but hasn't yet).
   isAreaLazy: function(aArea) {
     if (gPlacements.has(aArea)) {
       return false;
     }
     return gAreas.get(aArea).has("legacy");
   },
 
-  //XXXunf Log some warnings here, when the data provided isn't up to scratch.
+  // XXXunf Log some warnings here, when the data provided isn't up to scratch.
   normalizeWidget: function(aData, aSource) {
     let widget = {
       implementation: aData,
       source: aSource || CustomizableUI.SOURCE_EXTERNAL,
       instances: new Map(),
       currentArea: null,
       removable: true,
       overflows: true,
@@ -3889,17 +3889,17 @@ function WidgetSingleWrapper(aWidget, aN
 
 /**
  * XULWidgetGroupWrapper is the common interface for interacting with an entire
  * widget group - AKA, all instances of a widget across a series of windows.
  * This particular wrapper is only used for widgets created via the old-school
  * XUL method (overlays, or programmatically injecting toolbaritems, or other
  * such things).
  */
-//XXXunf Going to need to hook this up to some events to keep it all live.
+// XXXunf Going to need to hook this up to some events to keep it all live.
 function XULWidgetGroupWrapper(aWidgetId) {
   this.isGroup = true;
   this.id = aWidgetId;
   this.type = "custom";
   this.provider = CustomizableUI.PROVIDER_XUL;
 
   this.forWindow = function XULWidgetGroupWrapper_forWindow(aWindow) {
     let wrapperMap;
--- a/browser/components/customizableui/CustomizableWidgets.jsm
+++ b/browser/components/customizableui/CustomizableWidgets.jsm
@@ -660,17 +660,17 @@ const CustomizableWidgets = [
       let zoomResetButton = node.childNodes[2];
       let window = aDocument.defaultView;
       function updateZoomResetButton() {
         let updateDisplay = true;
         // Label should always show 100% in customize mode, so don't update:
         if (aDocument.documentElement.hasAttribute("customizing")) {
           updateDisplay = false;
         }
-        //XXXgijs in some tests we get called very early, and there's no docShell on the
+        // XXXgijs in some tests we get called very early, and there's no docShell on the
         // tabbrowser. This breaks the zoom toolkit code (see bug 897410). Don't let that happen:
         let zoomFactor = 100;
         try {
           zoomFactor = Math.round(window.ZoomManager.zoom * 100);
         } catch (e) {}
         zoomResetButton.setAttribute("label", CustomizableUI.getLocalizedProperty(
           buttons[1], "label", [updateDisplay ? zoomFactor : 100]
         ));
--- a/browser/components/customizableui/CustomizeMode.jsm
+++ b/browser/components/customizableui/CustomizeMode.jsm
@@ -799,17 +799,17 @@ CustomizeMode.prototype = {
       this.visiblePalette.appendChild(fragment);
       this._stowedPalette = this.window.gNavToolbox.palette;
       this.window.gNavToolbox.palette = this.visiblePalette;
     } catch (ex) {
       log.error(ex);
     }
   },
 
-  //XXXunf Maybe this should use -moz-element instead of wrapping the node?
+  // XXXunf Maybe this should use -moz-element instead of wrapping the node?
   //       Would ensure no weird interactions/event handling from original node,
   //       and makes it possible to put this in a lazy-loaded iframe/real tab
   //       while still getting rid of the need for overlays.
   makePaletteItem: function(aWidget, aPlace) {
     let widgetNode = aWidget.forWindow(this.window).node;
     if (!widgetNode) {
       log.error("Widget with id " + aWidget.id + " does not return a valid node");
       return null;
@@ -832,22 +832,22 @@ CustomizeMode.prototype = {
       while (paletteChild) {
         nextChild = paletteChild.nextElementSibling;
         let provider = CustomizableUI.getWidget(paletteChild.id).provider;
         if (provider == CustomizableUI.PROVIDER_XUL) {
           let unwrappedPaletteItem =
             yield this.deferredUnwrapToolbarItem(paletteChild);
           this._stowedPalette.appendChild(unwrappedPaletteItem);
         } else if (provider == CustomizableUI.PROVIDER_API) {
-          //XXXunf Currently this doesn't destroy the (now unused) node. It would
+          // XXXunf Currently this doesn't destroy the (now unused) node. It would
           //       be good to do so, but we need to keep strong refs to it in
           //       CustomizableUI (can't iterate of WeakMaps), and there's the
           //       question of what behavior wrappers should have if consumers
           //       keep hold of them.
-          //widget.destroyInstance(widgetNode);
+          // widget.destroyInstance(widgetNode);
         } else if (provider == CustomizableUI.PROVIDER_SPECIAL) {
           this.visiblePalette.removeChild(paletteChild);
         }
 
         paletteChild = nextChild;
       }
       this.visiblePalette.hidden = false;
       this.window.gNavToolbox.palette = this._stowedPalette;
@@ -1020,17 +1020,17 @@ CustomizeMode.prototype = {
     if (aWrapper.hasAttribute("itemchecked")) {
       toolbarItem.checked = true;
     }
 
     if (aWrapper.hasAttribute("itemcommand")) {
       let commandID = aWrapper.getAttribute("itemcommand");
       toolbarItem.setAttribute("command", commandID);
 
-      //XXX Bug 309953 - toolbarbuttons aren't in sync with their commands after customizing
+      // XXX Bug 309953 - toolbarbuttons aren't in sync with their commands after customizing
       let command = this.document.getElementById(commandID);
       if (command && command.hasAttribute("disabled")) {
         toolbarItem.setAttribute("disabled", command.getAttribute("disabled"));
       }
     }
 
     let wrappedContext = toolbarItem.getAttribute("wrapped-context");
     if (wrappedContext) {
@@ -2256,17 +2256,17 @@ CustomizeMode.prototype = {
     let orphanedItems = narrowItemsAfterWideItem % CustomizableUI.PANEL_COLUMN_COUNT;
     let placeholders = CustomizableUI.PANEL_COLUMN_COUNT - orphanedItems;
 
     let currentPlaceholderCount = contents.querySelectorAll("." + kPlaceholderClass).length;
     if (placeholders > currentPlaceholderCount) {
       while (placeholders-- > currentPlaceholderCount) {
         let placeholder = doc.createElement("toolbarpaletteitem");
         placeholder.classList.add(kPlaceholderClass);
-        //XXXjaws The toolbarbutton child here is only necessary to get
+        // XXXjaws The toolbarbutton child here is only necessary to get
         //  the styling right here.
         let placeholderChild = doc.createElement("toolbarbutton");
         placeholderChild.classList.add(kPlaceholderClass + "-child");
         placeholder.appendChild(placeholderChild);
         contents.appendChild(placeholder);
       }
     } else if (placeholders < currentPlaceholderCount) {
       while (placeholders++ < currentPlaceholderCount) {
--- a/browser/components/customizableui/DragPositionManager.jsm
+++ b/browser/components/customizableui/DragPositionManager.jsm
@@ -351,17 +351,17 @@ AreaPositionManager.prototype = {
       this._nodePositionStore.set(aNode, rect);
     }
     return rect;
   },
 
   _firstInRow: function(aNode) {
     // XXXmconley: I'm not entirely sure why we need to take the floor of these
     // values - it looks like, periodically, we're getting fractional pixels back
-    //from lazyStoreGet. I've filed bug 994247 to investigate.
+    // from lazyStoreGet. I've filed bug 994247 to investigate.
     let bound = Math.floor(this._lazyStoreGet(aNode).top);
     let rv = aNode;
     let prev;
     while (rv && (prev = this._getVisibleSiblingForDirection(rv, "previous"))) {
       if (Math.floor(this._lazyStoreGet(prev).bottom) <= bound) {
         return rv;
       }
       rv = prev;
--- a/browser/components/customizableui/content/panelUI.xml
+++ b/browser/components/customizableui/content/panelUI.xml
@@ -441,17 +441,17 @@
         ]]></body>
       </method>
 
       <method name="_heightOfSubview">
         <parameter name="aSubview"/>
         <parameter name="aContainerToCheck"/>
         <body><![CDATA[
           function getFullHeight(element) {
-            //XXXgijs: unfortunately, scrollHeight rounds values, and there's no alternative
+            // XXXgijs: unfortunately, scrollHeight rounds values, and there's no alternative
             // that works with overflow: auto elements. Fortunately for us,
             // we have exactly 1 (potentially) scrolling element in here (the subview body),
             // and rounding 1 value is OK - rounding more than 1 and adding them means we get
             // off-by-1 errors. Now we might be off by a subpixel, but we care less about that.
             // So, use scrollHeight *only* if the element is vertically scrollable.
             let height;
             let elementCS;
             if (element.scrollTopMax) {
--- a/browser/components/customizableui/test/browser_942581_unregisterArea_keeps_placements.js
+++ b/browser/components/customizableui/test/browser_942581_unregisterArea_keeps_placements.js
@@ -65,17 +65,17 @@ add_task(function*() {
   // Recreate ourselves with the default placements being the same:
   toolbarNode = createToolbarWithPlacements(kToolbarName, widgetIds);
   // Should now be back to default:
   checkAbstractAndRealPlacements(toolbarNode, widgetIds);
   CustomizableUI.unregisterArea(kToolbarName, true);
   checkWidgetFates(widgetIds);
   toolbarNode.remove();
 
-  //XXXgijs: ensure cleanup function doesn't barf:
+  // XXXgijs: ensure cleanup function doesn't barf:
   gAddedToolbars.delete(kToolbarName);
 
   // Remove all the XUL widgets, destroy the others:
   for (let widget of widgetIds) {
     let widgetWrapper = CustomizableUI.getWidget(widget);
     if (widgetWrapper.provider == CustomizableUI.PROVIDER_XUL) {
       gNavToolbox.palette.querySelector("#" + widget).remove();
     } else {
--- a/browser/components/customizableui/test/browser_952963_areaType_getter_no_area.js
+++ b/browser/components/customizableui/test/browser_952963_areaType_getter_no_area.js
@@ -37,16 +37,16 @@ add_task(function*() {
   CustomizableUI.createWidget(spec);
   toolbarNode = createToolbarWithPlacements(kToolbarName, [kUnregisterAreaTestWidget]);
   CustomizableUI.unregisterArea(kToolbarName);
   toolbarNode.remove();
   w = CustomizableUI.getWidget(spec.id);
   checkAreaType(w);
   CustomizableUI.removeWidgetFromArea(kUnregisterAreaTestWidget);
   checkAreaType(w);
-  //XXXgijs: ensure cleanup function doesn't barf:
+  // XXXgijs: ensure cleanup function doesn't barf:
   gAddedToolbars.delete(kToolbarName);
 });
 
 add_task(function* asyncCleanup() {
   yield resetCustomization();
 });
 
--- a/browser/components/customizableui/test/browser_968447_bookmarks_toolbar_items_in_panel.js
+++ b/browser/components/customizableui/test/browser_968447_bookmarks_toolbar_items_in_panel.js
@@ -38,17 +38,17 @@ add_task(function*() {
   yield newWin.PanelUI.show();
   let newWinBookmarksToolbarPlaceholder = newWin.document.getElementById(buttonId);
   ok(newWinBookmarksToolbarPlaceholder.classList.contains("toolbarbutton-1"),
      "Button in new window should have toolbarbutton-1 class");
   is(newWinBookmarksToolbarPlaceholder.getAttribute("wrap"), "true",
      "Button in new window should have 'wrap' attribute");
 
   newWin.PanelUI.panel.removeEventListener("popuphidden", hideTrace);
-  //XXXgijs on Linux, we're sometimes seeing the panel being hidden early
+  // XXXgijs on Linux, we're sometimes seeing the panel being hidden early
   // in the newly created window, probably because something else steals focus.
   if (newWin.PanelUI.panel.state != "closed") {
     info("Panel is still open in new window, waiting for it to close");
     panelHiddenPromise = promisePanelHidden(newWin);
     newWin.PanelUI.hide();
     yield panelHiddenPromise;
   } else {
     info("panel was already closed");
--- a/browser/components/customizableui/test/browser_973641_button_addon.js
+++ b/browser/components/customizableui/test/browser_973641_button_addon.js
@@ -25,17 +25,17 @@ add_task(function*() {
   let addonButton = document.getElementById(kButton);
   let navBar = document.getElementById("nav-bar");
   ok(addonButton, "Addon button exists");
   ok(navBar.contains(addonButton), "Addon button is in the navbar");
   yield checkButtonFunctionality(addonButton);
 
   resetTabs();
 
-  //move the add-on button in the Panel Menu
+  // move the add-on button in the Panel Menu
   CustomizableUI.addWidgetToArea(kButton, CustomizableUI.AREA_PANEL);
   let addonButtonInNavbar = navBar.getElementsByAttribute("id", kButton);
   ok(!navBar.contains(addonButton), "Addon button was removed from the browser bar");
 
   // check the addon button's functionality in the Panel Menu
   yield PanelUI.show();
   var panelMenu = document.getElementById("PanelUI-mainView");
   let addonButtonInPanel = panelMenu.getElementsByAttribute("id", kButton);
@@ -50,22 +50,22 @@ add_task(function* asyncCleanup() {
   yield resetCustomization();
   ok(CustomizableUI.inDefaultState, "The UI is in default state again.");
 
   // destroy the widget
   CustomizableUI.destroyWidget(kButton);
 });
 
 function resetTabs() {
-  //close all opened tabs
+  // close all opened tabs
   while (gBrowser.tabs.length > 1) {
     gBrowser.removeTab(gBrowser.selectedTab);
   }
 
-  //restore the initial tab
+  // restore the initial tab
   gBrowser.addTab(initialLocation);
   gBrowser.removeTab(gBrowser.selectedTab);
 }
 
 function* checkButtonFunctionality(aButton) {
   aButton.click();
   yield waitForCondition(() => gBrowser.currentURI &&
                                gBrowser.currentURI.spec == "about:addons");
--- a/browser/components/customizableui/test/browser_995164_registerArea_during_customize_mode.js
+++ b/browser/components/customizableui/test/browser_995164_registerArea_during_customize_mode.js
@@ -86,17 +86,17 @@ add_task(function*() {
   button.scrollIntoView();
   simulateItemDrag(button, toolbar);
   ok(CustomizableUI.getPlacementOfWidget(kNonPlacedWidgetId), "Button moved out of palette");
   is(CustomizableUI.getPlacementOfWidget(kNonPlacedWidgetId).area, TOOLBARID, "Button's back on toolbar");
   ok(toolbar.querySelector(`#${kNonPlacedWidgetId}`), "Button really is on toolbar.");
   ok(otherTB.querySelector(`#${kNonPlacedWidgetId}`), "Button is on other toolbar, too.");
 
   let wasInformedCorrectlyOfAreaDisappearing = false;
-  //XXXgijs So we could be using promiseWindowClosed here. However, after
+  // XXXgijs So we could be using promiseWindowClosed here. However, after
   // repeated random oranges, I'm instead relying on onWindowClosed below to
   // fire appropriately - it is linked to an unload event as well, and so
   // reusing it prevents a potential race between unload handlers where the
   // one from promiseWindowClosed could fire before the onWindowClosed
   // (and therefore onAreaNodeRegistered) one, causing the test to fail.
   let windowCloseDeferred = Promise.defer();
   listener = {
     onAreaNodeUnregistered: function(aArea, aNode, aReason) {
--- a/browser/components/feeds/WebContentConverter.js
+++ b/browser/components/feeds/WebContentConverter.js
@@ -829,17 +829,17 @@ WebContentConverterRegistrar.prototype =
 
     // We need to do this _after_ registering all of the available handlers,
     // so that getWebContentHandlerByURI can return successfully.
     let autoBranch;
     try {
       autoBranch = ps.getBranch(PREF_CONTENTHANDLERS_AUTO);
     } catch (e) {
       // No auto branch yet, that's fine
-      //LOG("WCCR.init: There is no auto branch, benign");
+      // LOG("WCCR.init: There is no auto branch, benign");
     }
 
     if (autoBranch) {
       for (let type of autoBranch.getChildList("")) {
         let uri = autoBranch.getCharPref(type);
         if (uri) {
           let handler = this.getWebContentHandlerByURI(type, uri);
           if (handler) {
--- a/browser/components/migration/ESEDBReader.jsm
+++ b/browser/components/migration/ESEDBReader.jsm
@@ -104,34 +104,34 @@ let gOpenDBs = new Map();
 // Track open libraries
 let gLibs = {};
 this.ESE = ESE; // Required for tests.
 this.KERNEL = KERNEL; // ditto
 this.gLibs = gLibs; // ditto
 
 function convertESEError(errorCode) {
   switch (errorCode) {
-    case -1213 /*JET_errPageSizeMismatch */:
-    case -1002 /*JET_errInvalidName*/:
-    case -1507 /*JET_errColumnNotFound */:
+    case -1213 /* JET_errPageSizeMismatch */:
+    case -1002 /* JET_errInvalidName*/:
+    case -1507 /* JET_errColumnNotFound */:
       // The DB format has changed and we haven't updated this migration code:
       return "The database format has changed, error code: " + errorCode;
-    case -1207 /*JET_errDatabaseLocked */:
-    case -1302 /*JET_errTableLocked */:
+    case -1207 /* JET_errDatabaseLocked */:
+    case -1302 /* JET_errTableLocked */:
       return "The database or table is locked, error code: " + errorCode;
     case -1809 /* JET_errPermissionDenied*/:
     case -1907 /* JET_errAccessDenied */:
       return "Access or permission denied, error code: " + errorCode;
     case -1044 /* JET_errInvalidFilename */:
       return "Invalid file name";
-    case -1811 /*JET_errFileNotFound */:
+    case -1811 /* JET_errFileNotFound */:
       return "File not found";
-    case -550 /*JET_errDatabaseDirtyShutdown */:
+    case -550 /* JET_errDatabaseDirtyShutdown */:
       return "Database in dirty shutdown state (without the requisite logs?)";
-    case -514 /*JET_errBadLogVersion */:
+    case -514 /* JET_errBadLogVersion */:
       return "Database log version does not match the version of ESE in use.";
     default:
       return "Unknown error: " + errorCode;
   }
 }
 
 function handleESEError(method, methodName, shouldThrow = true, errorLog = true) {
   return function () {
--- a/browser/components/migration/IEProfileMigrator.js
+++ b/browser/components/migration/IEProfileMigrator.js
@@ -28,17 +28,17 @@ XPCOMUtils.defineLazyModuleGetter(this, 
                                   "resource://gre/modules/PlacesUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "OSCrypto",
                                   "resource://gre/modules/OSCrypto.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "WindowsRegistry",
                                   "resource://gre/modules/WindowsRegistry.jsm");
 
 Cu.importGlobalProperties(["URL"]);
 
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
 // Resources
 
 
 function History() {
 }
 
 History.prototype = {
   type: MigrationUtils.resourceTypes.HISTORY,
@@ -461,18 +461,18 @@ Settings.prototype = {
         Services.prefs.setBoolPref(aPref, value);
         break;
       default:
         throw new Error("Unexpected value type: " + (typeof value));
     }
   }
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// Migrator
+// //////////////////////////////////////////////////////////////////////////////
+// // Migrator
 
 function IEProfileMigrator()
 {
   this.wrappedJSObject = this; // export this to be able to use it in the unittest.
 }
 
 IEProfileMigrator.prototype = Object.create(MigratorPrototype);
 
--- a/browser/components/migration/MSMigrationUtils.jsm
+++ b/browser/components/migration/MSMigrationUtils.jsm
@@ -36,18 +36,18 @@ const RESULT_SUCCESS = 0;
 const VAULT_ENUMERATE_ALL_ITEMS = 512;
 const WEB_CREDENTIALS_VAULT_ID = [0x4BF4C442,
                                   0x41A09B8A,
                                   0x4ADD80B3,
                                   0x28DB4D70];
 
 Cu.importGlobalProperties(["File"]);
 
-////////////////////////////////////////////////////////////////////////////////
-//// Helpers.
+// //////////////////////////////////////////////////////////////////////////////
+// // Helpers.
 
 const wintypes = {
   BOOL: ctypes.int,
   DWORD: ctypes.uint32_t,
   DWORDLONG: ctypes.uint64_t,
   CHAR: ctypes.char,
   PCHAR: ctypes.char.ptr,
   LPCWSTR: ctypes.char16_t.ptr,
--- a/browser/components/migration/MigrationUtils.jsm
+++ b/browser/components/migration/MigrationUtils.jsm
@@ -383,17 +383,17 @@ this.MigratorPrototype = {
       }
     }
     catch (ex) {
       Cu.reportError(ex);
     }
     return exists;
   },
 
-  /*** PRIVATE STUFF - DO NOT OVERRIDE ***/
+  /** * PRIVATE STUFF - DO NOT OVERRIDE ***/
   _getMaybeCachedResources: function PMB__getMaybeCachedResources(aProfile) {
     let profileKey = aProfile ? aProfile.id : "";
     if (this._resourcesByProfile) {
       if (profileKey in this._resourcesByProfile)
         return this._resourcesByProfile[profileKey];
     }
     else {
       this._resourcesByProfile = { };
--- a/browser/components/migration/tests/unit/test_IE7_passwords.js
+++ b/browser/components/migration/tests/unit/test_IE7_passwords.js
@@ -334,17 +334,17 @@ add_task(function* test_passwordsAvailab
 
   let crypto = new OSCrypto();
   let hashes = []; // the hashes of all migrator websites, this is going to be used for the clean up
 
   do_register_cleanup(() => {
     Services.logins.removeAllLogins();
     logins = Services.logins.getAllLogins({});
     Assert.equal(logins.length, 0, "There are no logins after the cleanup");
-    //remove all the values created in this test from the registry
+    // remove all the values created in this test from the registry
     removeAllValues(Storage2Key, hashes);
     // restore all backed up values
     restore(Storage2Key);
 
     // clean the dummy value
     if (Storage2Key.hasValue("dummy")) {
       Storage2Key.removeValue("dummy");
     }
--- a/browser/components/newtab/NewTabMessages.jsm
+++ b/browser/components/newtab/NewTabMessages.jsm
@@ -1,9 +1,9 @@
-/*global
+/* global
   NewTabWebChannel,
   NewTabPrefsProvider,
   PlacesProvider,
   PreviewProvider,
   NewTabSearchProvider,
   Preferences,
   XPCOMUtils,
   Task
@@ -159,17 +159,17 @@ let NewTabMessages = {
    */
   handlePlacesChange(type, data) {
     NewTabWebChannel.broadcast(ACTIONS.links.outPlacesChange, {type, data});
   },
 
   /*
    * Broadcast current engine has changed to all open newtab pages
    */
-  _handleCurrentEngineChange(name, value) { //jshint unused: false
+  _handleCurrentEngineChange(name, value) { // jshint unused: false
     let engine = value;
     NewTabWebChannel.broadcast(ACTIONS.search.outSearch.currentEngine, engine);
   },
 
   /*
    * Broadcast preference changes to all open newtab pages
    */
   handlePrefChange(actionName, value) {
--- a/browser/components/newtab/aboutNewTabService.js
+++ b/browser/components/newtab/aboutNewTabService.js
@@ -98,17 +98,17 @@ AboutNewTabService.prototype = {
   _overridden: false,
 
   classID: Components.ID("{dfcd2adc-7867-4d3a-ba70-17501f208142}"),
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIAboutNewTabService]),
   _xpcom_categories: [{
     service: true
   }],
 
-  _handleToggleEvent(prefName, stateEnabled, forceState) { //jshint unused:false
+  _handleToggleEvent(prefName, stateEnabled, forceState) { // jshint unused:false
     if (this.toggleRemote(stateEnabled, forceState)) {
       Services.obs.notifyObservers(null, "newtab-url-changed", ABOUT_URL);
     }
   },
 
   /**
    * React to changes to the remote newtab pref.
    *
--- a/browser/components/newtab/tests/browser/browser_newtab_overrides.js
+++ b/browser/components/newtab/tests/browser/browser_newtab_overrides.js
@@ -1,9 +1,9 @@
-/*globals
+/* globals
   XPCOMUtils,
   aboutNewTabService,
   Services,
   ContentTask,
   TestUtils,
   BrowserOpenTab,
   registerCleanupFunction,
   is,
--- a/browser/components/newtab/tests/xpcshell/test_NewTabSearchProvider.js
+++ b/browser/components/newtab/tests/xpcshell/test_NewTabSearchProvider.js
@@ -45,17 +45,17 @@ add_task(function* test_search() {
   ["engines", "currentEngine"].forEach(stateProps);
 
   // check that the current engine is correct and has correct properties
   let {currentEngine} = state;
   equal(currentEngine.name, Services.search.currentEngine.name, "Current engine has been correctly set");
   var engineProps = hasProp(currentEngine);
   ["name", "placeholder", "iconBuffer"].forEach(engineProps);
 
-  //create dummy test engines to test observer
+  // create dummy test engines to test observer
   Services.search.addEngineWithDetails("TestSearch1", "", "", "", "GET",
     "http://example.com/?q={searchTerms}");
   Services.search.addEngineWithDetails("TestSearch2", "", "", "", "GET",
     "http://example.com/?q={searchTerms}");
 
   // set one of the dummy test engines to the default engine
   Services.search.defaultEngine = Services.search.getEngineByName("TestSearch1");
 
--- a/browser/components/nsBrowserContentHandler.js
+++ b/browser/components/nsBrowserContentHandler.js
@@ -204,41 +204,41 @@ function openWindow(parent, url, target,
     var uriArray = Components.classes["@mozilla.org/array;1"]
                        .createInstance(Components.interfaces.nsIMutableArray);
     stringArgs.forEach(function (uri) {
       var sstring = Components.classes["@mozilla.org/supports-string;1"]
                               .createInstance(nsISupportsString);
       sstring.data = uri;
       uriArray.appendElement(sstring, /* weak = */ false);
     });
-    argArray.appendElement(uriArray, /*weak =*/ false);
+    argArray.appendElement(uriArray, /* weak =*/ false);
   } else {
-    argArray.appendElement(null, /*weak =*/ false);
+    argArray.appendElement(null, /* weak =*/ false);
   }
 
   // Pass these as null to ensure that we always trigger the "single URL"
   // behavior in browser.js's gBrowserInit.onLoad (which handles the window
   // arguments)
-  argArray.appendElement(null, /*weak =*/ false); // charset
-  argArray.appendElement(null, /*weak =*/ false); // referer
-  argArray.appendElement(null, /*weak =*/ false); // postData
-  argArray.appendElement(null, /*weak =*/ false); // allowThirdPartyFixup
+  argArray.appendElement(null, /* weak =*/ false); // charset
+  argArray.appendElement(null, /* weak =*/ false); // referer
+  argArray.appendElement(null, /* weak =*/ false); // postData
+  argArray.appendElement(null, /* weak =*/ false); // allowThirdPartyFixup
 
   return Services.ww.openWindow(parent, url, target, features, argArray);
 }
 
 function openPreferences() {
   var args = Components.classes["@mozilla.org/array;1"]
                      .createInstance(Components.interfaces.nsIMutableArray);
 
   var wuri = Components.classes["@mozilla.org/supports-string;1"]
                        .createInstance(Components.interfaces.nsISupportsString);
   wuri.data = "about:preferences";
 
-  args.appendElement(wuri, /*weak =*/ false);
+  args.appendElement(wuri, /* weak = */ false);
 
   Services.ww.openWindow(null, gBrowserContentHandler.chromeURL,
                          "_blank",
                          "chrome,dialog=no,all",
                          args);
 }
 
 function logSystemBasedSearch(engine) {
@@ -256,20 +256,20 @@ function doSearch(searchTerm, cmdLine) {
   // fill our nsIMutableArray with uri-as-wstring, null, null, postData
   var args = Components.classes["@mozilla.org/array;1"]
                      .createInstance(Components.interfaces.nsIMutableArray);
 
   var wuri = Components.classes["@mozilla.org/supports-string;1"]
                        .createInstance(Components.interfaces.nsISupportsString);
   wuri.data = submission.uri.spec;
 
-  args.appendElement(wuri, /*weak =*/ false);
-  args.appendElement(null, /*weak =*/ false);
-  args.appendElement(null, /*weak =*/ false);
-  args.appendElement(submission.postData, /*weak =*/ false);
+  args.appendElement(wuri, /* weak =*/ false);
+  args.appendElement(null, /* weak =*/ false);
+  args.appendElement(null, /* weak =*/ false);
+  args.appendElement(submission.postData, /* weak =*/ false);
 
   // XXXbsmedberg: use handURIToExistingBrowser to obey tabbed-browsing
   // preferences, but need nsIBrowserDOMWindow extensions
 
   return Services.ww.openWindow(null, gBrowserContentHandler.chromeURL,
                                 "_blank",
                                 "chrome,dialog=no,all" +
                                 gBrowserContentHandler.getFeatures(cmdLine),
--- a/browser/components/places/PlacesUIUtils.jsm
+++ b/browser/components/places/PlacesUIUtils.jsm
@@ -955,17 +955,17 @@ this.PlacesUIUtils = {
     // open (Bug 630255).
     var where = browserWindow ?
                 browserWindow.whereToOpenLink(aEvent, false, true) : "window";
     if (where == "window") {
       // There is no browser window open, thus open a new one.
       var uriList = PlacesUtils.toISupportsString(urls.join("|"));
       var args = Cc["@mozilla.org/array;1"].
                   createInstance(Ci.nsIMutableArray);
-      args.appendElement(uriList, /*weak =*/ false);
+      args.appendElement(uriList, /* weak =*/ false);
       browserWindow = Services.ww.openWindow(aWindow,
                                              "chrome://browser/content/browser.xul",
                                              null, "chrome,dialog=no,all", args);
       return;
     }
 
     var loadInBackground = where == "tabshifted" ? true : false;
     // For consistency, we want all the bookmarks to open in new tabs, instead
@@ -1718,18 +1718,18 @@ XPCOMUtils.defineLazyGetter(PlacesUIUtil
       let annoObj = { name: PlacesUIUtils.DESCRIPTION_ANNO,
                       type: Ci.nsIAnnotationService.TYPE_STRING,
                       flags: 0,
                       value: aDescription,
                       expires: Ci.nsIAnnotationService.EXPIRE_NEVER };
       return new PlacesSetItemAnnotationTransaction(aItemId, annoObj);
     },
 
-    ////////////////////////////////////////////////////////////////////////////
-    //// nsITransactionManager forwarders.
+    // //////////////////////////////////////////////////////////////////////////
+    // // nsITransactionManager forwarders.
 
     beginBatch: () =>
       PlacesUtils.transactionManager.beginBatch(null),
 
     endBatch: () =>
       PlacesUtils.transactionManager.endBatch(false),
 
     doTransaction: (txn) =>
--- a/browser/components/places/content/bookmarkProperties.js
+++ b/browser/components/places/content/bookmarkProperties.js
@@ -528,17 +528,17 @@ var BookmarkPropertiesPanel = {
 
     if (this._loadInSidebar) {
       let annoObj = { name   : PlacesUIUtils.LOAD_IN_SIDEBAR_ANNO,
                       value  : true };
       let setLoadTxn = new PlacesSetItemAnnotationTransaction(-1, annoObj);
       childTransactions.push(setLoadTxn);
     }
 
-    //XXX TODO: this should be in a transaction!
+    // XXX TODO: this should be in a transaction!
     if (this._charSet && !PrivateBrowsingUtils.isWindowPrivate(window))
       PlacesUtils.setCharsetForURI(this._uri, this._charSet);
 
     let createTxn = new PlacesCreateBookmarkTransaction(this._uri,
                                                         aContainer,
                                                         aIndex,
                                                         this._title,
                                                         this._keyword,
--- a/browser/components/places/content/places.js
+++ b/browser/components/places/content/places.js
@@ -1297,17 +1297,17 @@ var ContentArea = {
    */
   setContentViewForQueryString:
   function CA_setContentViewForQueryString(aQueryString, aView, aOptions) {
     if (!aQueryString ||
         typeof aView != "object" && typeof aView != "function")
       throw new Error("Invalid arguments");
 
     this._specialViews.set(aQueryString, { view: aView,
-                                           options: aOptions || new Object() });
+                                           options: aOptions || {} });
   },
 
   get currentView() {
     return PlacesUIUtils.getViewForNode(this._deck.selectedPanel);
   },
   set currentView(aNewView) {
     let oldView = this.currentView;
     if (oldView != aNewView) {
--- a/browser/components/places/tests/browser/browser_bookmarksProperties.js
+++ b/browser/components/places/tests/browser/browser_bookmarksProperties.js
@@ -47,17 +47,17 @@ function add_bookmark(aURI) {
                                        "bookmark/" + aURI.spec);
   return bId;
 }
 
 // Each test is an obj w/ a desc property and run method.
 var gTests = [];
 var gCurrentTest = null;
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // Bug 462662 - Pressing Enter to select tag from autocomplete closes bookmarks properties dialog
 gTests.push({
   desc: "Bug 462662 - Pressing Enter to select tag from autocomplete closes bookmarks properties dialog",
   sidebar: SIDEBAR_BOOKMARKS_ID,
   action: ACTION_EDIT,
   itemType: null,
   window: null,
   _itemId: null,
@@ -148,17 +148,17 @@ gTests.push({
     is(tags[0], "testTag", "Tag on node has not changed");
 
     // Cleanup.
     PlacesUtils.tagging.untagURI(PlacesUtils._uri(TEST_URL), ["testTag"]);
     PlacesUtils.bookmarks.removeItem(this._itemId);
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // Bug 476020 - Pressing Esc while having the tag autocomplete open closes the bookmarks panel
 
 gTests.push({
   desc: "Bug 476020 - Pressing Esc while having the tag autocomplete open closes the bookmarks panel",
   sidebar: SIDEBAR_BOOKMARKS_ID,
   action: ACTION_EDIT,
   itemType: null,
   window: null,
@@ -249,17 +249,17 @@ gTests.push({
 
     // Cleanup.
     PlacesUtils.tagging.untagURI(PlacesUtils._uri(TEST_URL),
                                  ["testTag"]);
     PlacesUtils.bookmarks.removeItem(this._itemId);
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 //  Bug 491269 - Test that editing folder name in bookmarks properties dialog does not accept the dialog
 
 gTests.push({
   desc: " Bug 491269 - Test that editing folder name in bookmarks properties dialog does not accept the dialog",
   sidebar: SIDEBAR_HISTORY_ID,
   action: ACTION_ADD,
   historyView: SIDEBAR_HISTORY_BYLASTVISITED_VIEW,
   window: null,
@@ -320,17 +320,17 @@ gTests.push({
     runNextTest();
   },
 
   cleanup: function() {
     return PlacesTestUtils.clearHistory();
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 function test() {
   waitForExplicitFinish();
   // This test can take some time, if we timeout too early it could run
   // in the middle of other tests, or hang them.
   requestLongerTimeout(2);
 
   // Sanity checks.
--- a/browser/components/places/tests/browser/browser_drag_bookmarks_on_toolbar.js
+++ b/browser/components/places/tests/browser/browser_drag_bookmarks_on_toolbar.js
@@ -135,17 +135,17 @@ function getExpectedDataForPlacesNode(aN
     wrappedNode.push(wrappedFlavor);
   });
 
   return [wrappedNode];
 }
 
 var gTests = [
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
   {
     desc: "Drag a folder on toolbar",
     run: function() {
       // Create a test folder to be dragged.
       var folderId = PlacesUtils.bookmarks
                                 .createFolder(PlacesUtils.toolbarFolderId,
                                               TEST_TITLE,
@@ -176,17 +176,17 @@ var gTests = [
                       nextTest();
                     });
                 });
             });
         });
     }
   },
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
   {
     desc: "Drag a bookmark on toolbar",
     run: function() {
       // Create a test bookmark to be dragged.
       var itemId = PlacesUtils.bookmarks
                               .insertBookmark(PlacesUtils.toolbarFolderId,
                                               PlacesUtils._uri(TEST_URL),
--- a/browser/components/places/tests/browser/browser_library_batch_delete.js
+++ b/browser/components/places/tests/browser/browser_library_batch_delete.js
@@ -5,17 +5,17 @@
  *  Tests that Library handles correctly batch deletes.
  */
 
 const TEST_URL = "http://www.batch.delete.me/";
 
 var gTests = [];
 var gLibrary;
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 gTests.push({
   desc: "Create and batch remove bookmarks",
   run: function() {
     let testURI = makeURI(TEST_URL);
     PlacesUtils.history.runInBatchMode({
       runBatched: function (aUserData) {
         // Create a folder in unserted and populate it with bookmarks.
@@ -58,17 +58,17 @@ gTests.push({
     // Test live update.
     is(unsortedNode.childCount, 1, "Unsorted node has 1 child");
     is(PO._places.selectedNode.title, "keepme", "Folder node selected");
     unsortedNode.containerOpen = false;
     nextTest();
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 gTests.push({
   desc: "Ensure correct selection and functionality in Library",
   run: function() {
     let PO = gLibrary.PlacesOrganizer;
     let ContentTree = gLibrary.ContentTree;
     // Move selection forth and back.
     PO.selectLeftPaneQuery("History");
@@ -83,17 +83,17 @@ gTests.push({
                                          PlacesUtils.bookmarks.DEFAULT_INDEX,
                                          "bm");
     is(ContentTree.view.result.root.childCount, 2,
        "Right pane was correctly updated");
     nextTest();
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 function test() {
   waitForExplicitFinish();
   registerCleanupFunction(function () {
     PlacesUtils.bookmarks
                .removeFolderChildren(PlacesUtils.unfiledBookmarksFolderId);
   });
 
--- a/browser/components/places/tests/browser/browser_library_infoBox.js
+++ b/browser/components/places/tests/browser/browser_library_infoBox.js
@@ -7,17 +7,17 @@
  *  additionalInfoFields in infoBox section of library
  */
 
 const TEST_URI = "http://www.mozilla.org/";
 
 var gTests = [];
 var gLibrary;
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 gTests.push({
   desc: "Bug 430148 - Remove or hide the more/less button in details pane...",
   run: function() {
     var PO = gLibrary.PlacesOrganizer;
     let ContentTree = gLibrary.ContentTree;
     var infoBoxExpanderWrapper = getAndCheckElmtById("infoBoxExpanderWrapper");
 
@@ -160,17 +160,17 @@ function checkAddInfoFields(PO, nodeName
 }
 
 function getAndCheckElmtById(id) {
   var elmt = gLibrary.document.getElementById(id);
   isnot(elmt, null, "Correctly got element: #" + id);
   return elmt;
 }
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 function nextTest() {
   if (gTests.length) {
     var test = gTests.shift();
     ok(true, "TEST: " + test.desc);
     dump("TEST: " + test.desc + "\n");
     test.run();
   }
--- a/browser/components/places/tests/browser/browser_library_middleclick.js
+++ b/browser/components/places/tests/browser/browser_library_middleclick.js
@@ -63,17 +63,17 @@ var gTabsListener = {
 
         // Test finished.  This will move to the next one.
         waitForFocus(gCurrentTest.finish, gBrowser.ownerGlobal);
       });
     }
   }
 }
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // Open bookmark in a new tab.
 
 gTests.push({
   desc: "Open bookmark in a new tab.",
   URIs: ["about:buildconfig"],
   _itemId: -1,
 
   setup: function() {
@@ -96,17 +96,17 @@ gTests.push({
     setTimeout(runNextTest, 0);
   },
 
   cleanup: function() {
     PlacesUtils.bookmarks.removeItem(this._itemId);
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // Open a folder in tabs.
 
 gTests.push({
   desc: "Open a folder in tabs.",
   URIs: ["about:buildconfig", "about:"],
   _folderId: -1,
 
   setup: function() {
@@ -138,17 +138,17 @@ gTests.push({
     setTimeout(runNextTest, 0);
   },
 
   cleanup: function() {
     PlacesUtils.bookmarks.removeItem(this._folderId);
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // Open a query in tabs.
 
 gTests.push({
   desc: "Open a query in tabs.",
   URIs: ["about:buildconfig", "about:"],
   _folderId: -1,
   _queryId: -1,
 
@@ -196,17 +196,17 @@ gTests.push({
   },
 
   cleanup: function() {
     PlacesUtils.bookmarks.removeItem(this._folderId);
     PlacesUtils.bookmarks.removeItem(this._queryId);
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 function test() {
   waitForExplicitFinish();
   // Increase timeout, this test can be quite slow due to waitForFocus calls.
   requestLongerTimeout(2);
 
   // Sanity checks.
   ok(PlacesUtils, "PlacesUtils in context");
--- a/browser/components/places/tests/browser/browser_library_search.js
+++ b/browser/components/places/tests/browser/browser_library_search.js
@@ -42,17 +42,17 @@ var testCases = [
   },
 
   function downloadsScope() {
     let defScope = getDefaultScope(PlacesUIUtils.leftPaneQueries["Downloads"]);
     search(PlacesUIUtils.leftPaneQueries["Downloads"], "dummy", defScope);
   },
 ];
 
-///////////////////////////////////////////////////////////////////////////////
+// /////////////////////////////////////////////////////////////////////////////
 
 /**
  * Returns the default search scope for a given folder.
  *
  * @param  aFolderId
  *         the item ID of a node in the left pane's tree
  * @return the default scope when the folder is newly selected
  */
@@ -155,17 +155,17 @@ function onLibraryAvailable() {
   gLibrary = null;
 
   // Cleanup.
   PlacesUtils.tagging.untagURI(PlacesUtils._uri(TEST_URL), ["dummyTag"]);
   PlacesUtils.bookmarks.removeFolderChildren(PlacesUtils.unfiledBookmarksFolderId);
   PlacesTestUtils.clearHistory().then(finish);
 }
 
-///////////////////////////////////////////////////////////////////////////////
+// /////////////////////////////////////////////////////////////////////////////
 
 function test() {
   waitForExplicitFinish();
 
   // Sanity:
   ok(PlacesUtils, "PlacesUtils in context");
 
   // Add visits, a bookmark and a tag.
--- a/browser/components/places/tests/browser/browser_sort_in_library.js
+++ b/browser/components/places/tests/browser/browser_sort_in_library.js
@@ -49,17 +49,17 @@ const SORT_LOOKUP_TABLE = {
 // determines this value.
 const DEFAULT_SORT_KEY = "TITLE";
 
 // Part of the test is checking that sorts stick, so each time we sort we need
 // to remember it.
 var prevSortDir = null;
 var prevSortKey = null;
 
-///////////////////////////////////////////////////////////////////////////////
+// /////////////////////////////////////////////////////////////////////////////
 
 /**
  * Ensures that the sort of aTree is aSortingMode and aSortingAnno.
  *
  * @param aTree
  *        the tree to check
  * @param aSortingMode
  *        one of the Ci.nsINavHistoryQueryOptions.SORT_BY_* constants
@@ -225,17 +225,17 @@ function testSortByDir(aOrganizerWin, aP
     let key = (aUnsortFirst ? DEFAULT_SORT_KEY : prevSortKey);
     let sortConst = "SORT_BY_" + key + "_" + dir.toUpperCase();
     let expectedSortMode = Ci.nsINavHistoryQueryOptions[sortConst];
     setSort(aOrganizerWin, aPlaceContentTree, aUnsortFirst, false, null, dir);
     checkSort(aPlaceContentTree, expectedSortMode, "");
   });
 }
 
-///////////////////////////////////////////////////////////////////////////////
+// /////////////////////////////////////////////////////////////////////////////
 
 function test() {
   waitForExplicitFinish();
 
   openLibrary(function (win) {
         let tree = win.document.getElementById("placeContent");
         isnot(tree, null, "sanity check: placeContent tree should exist");
         // Run the tests.
--- a/browser/components/preferences/cookies.js
+++ b/browser/components/preferences/cookies.js
@@ -857,17 +857,17 @@ var gCookiesWindow = {
     return aCookie.rawHost.indexOf(this._view._filterValue) != -1 ||
            aCookie.name.indexOf(this._view._filterValue) != -1 ||
            aCookie.value.indexOf(this._view._filterValue) != -1;
   },
 
   _filterCookies: function (aFilterValue) {
     this._view._filterValue = aFilterValue;
     var cookies = [];
-    for (let i = 0; i < gCookiesWindow._hostOrder.length; ++i) { //var host in gCookiesWindow._hosts) {
+    for (let i = 0; i < gCookiesWindow._hostOrder.length; ++i) { // var host in gCookiesWindow._hosts) {
       let currHost = gCookiesWindow._hosts[gCookiesWindow._hostOrder[i]]; // gCookiesWindow._hosts[host];
       if (!currHost) continue;
       for (let cookie of currHost.cookies) {
         if (this._cookieMatchesFilter(cookie))
           cookies.push(cookie);
       }
     }
     return cookies;
--- a/browser/components/preferences/in-content/applications.js
+++ b/browser/components/preferences/in-content/applications.js
@@ -1,15 +1,15 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
-//****************************************************************************//
+//* ***************************************************************************//
 // Constants & Enumeration Values
 
 Components.utils.import('resource://gre/modules/Services.jsm');
 Components.utils.import('resource://gre/modules/AppConstants.jsm');
 const TYPE_MAYBE_FEED = "application/vnd.mozilla.maybe.feed";
 const TYPE_MAYBE_VIDEO_FEED = "application/vnd.mozilla.maybe.video.feed";
 const TYPE_MAYBE_AUDIO_FEED = "application/vnd.mozilla.maybe.audio.feed";
 const TYPE_PDF = "application/pdf";
@@ -71,17 +71,17 @@ const kActionUsePlugin = 5;
 const ICON_URL_APP = AppConstants.platform == "linux" ?
                      "moz-icon://dummy.exe?size=16" :
                      "chrome://browser/skin/preferences/application.png";
 
 // For CSS. Can be one of "ask", "save", "plugin" or "feed". If absent, the icon URL
 // was set by us to a custom handler icon and CSS should not try to override it.
 const APP_ICON_ATTR_NAME = "appHandlerIcon";
 
-//****************************************************************************//
+//* ***************************************************************************//
 // Utilities
 
 function getFileDisplayName(file) {
   if (AppConstants.platform == "win") {
     if (file instanceof Ci.nsILocalFileWin) {
       try {
         return file.getVersionInfoField("FileDescription");
       } catch (e) {}
@@ -129,17 +129,17 @@ ArrayEnumerator.prototype = {
     return this._contents[this._index++];
   }
 };
 
 function isFeedType(t) {
   return t == TYPE_MAYBE_FEED || t == TYPE_MAYBE_VIDEO_FEED || t == TYPE_MAYBE_AUDIO_FEED;
 }
 
-//****************************************************************************//
+//* ***************************************************************************//
 // HandlerInfoWrapper
 
 /**
  * This object wraps nsIHandlerInfo with some additional functionality
  * the Applications prefpane needs to display and allow modification of
  * the list of handled types.
  *
  * We create an instance of this wrapper for each entry we might display
@@ -159,34 +159,34 @@ function HandlerInfoWrapper(aType, aHand
 
 HandlerInfoWrapper.prototype = {
   // The wrapped nsIHandlerInfo object.  In general, this object is private,
   // but there are a couple cases where callers access it directly for things
   // we haven't (yet?) implemented, so we make it a public property.
   wrappedHandlerInfo: null,
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // Convenience Utils
 
   _handlerSvc: Cc["@mozilla.org/uriloader/handler-service;1"].
                getService(Ci.nsIHandlerService),
 
   _prefSvc: Cc["@mozilla.org/preferences-service;1"].
             getService(Ci.nsIPrefBranch),
 
   _categoryMgr: Cc["@mozilla.org/categorymanager;1"].
                 getService(Ci.nsICategoryManager),
 
   element: function(aID) {
     return document.getElementById(aID);
   },
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // nsIHandlerInfo
 
   // The MIME type or protocol scheme.
   _type: null,
   get type() {
     return this._type;
   },
 
@@ -317,17 +317,17 @@ HandlerInfoWrapper.prototype = {
     return this.wrappedHandlerInfo.alwaysAskBeforeHandling;
   },
 
   set alwaysAskBeforeHandling(aNewValue) {
     this.wrappedHandlerInfo.alwaysAskBeforeHandling = aNewValue;
   },
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // nsIMIMEInfo
 
   // The primary file extension associated with this type, if any.
   //
   // XXX Plugin objects contain an array of MimeType objects with "suffixes"
   // properties; if this object has an associated plugin, shouldn't we check
   // those properties for an extension?
   get primaryExtension() {
@@ -336,17 +336,17 @@ HandlerInfoWrapper.prototype = {
           this.wrappedHandlerInfo.primaryExtension)
         return this.wrappedHandlerInfo.primaryExtension
     } catch (ex) {}
 
     return null;
   },
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // Plugin Handling
 
   // A plugin that can handle this type, if any.
   //
   // Note: just because we have one doesn't mean it *will* handle the type.
   // That depends on whether or not the type is in the list of types for which
   // plugin handling is disabled.
   plugin: null,
@@ -412,25 +412,25 @@ HandlerInfoWrapper.prototype = {
       addCategoryEntry("Gecko-Content-Viewers",
                        this.type,
                        "@mozilla.org/content/plugin/document-loader-factory;1",
                        false,
                        true);
   },
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // Storage
 
   store: function() {
     this._handlerSvc.store(this.wrappedHandlerInfo);
   },
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // Icons
 
   get smallIcon() {
     return this._getIcon(16);
   },
 
   _getIcon: function(aSize) {
     if (this.primaryExtension)
@@ -442,17 +442,17 @@ HandlerInfoWrapper.prototype = {
     // FIXME: consider returning some generic icon when we can't get a URL for
     // one (for example in the case of protocol schemes).  Filed as bug 395141.
     return null;
   }
 
 };
 
 
-//****************************************************************************//
+//* ***************************************************************************//
 // Feed Handler Info
 
 /**
  * This object implements nsIHandlerInfo for the feed types.  It's a separate
  * object because we currently store handling information for the feed type
  * in a set of preferences rather than the nsIHandlerService-managed datastore.
  *
  * This object inherits from HandlerInfoWrapper in order to get functionality
@@ -466,26 +466,26 @@ HandlerInfoWrapper.prototype = {
 
 function FeedHandlerInfo(aMIMEType) {
   HandlerInfoWrapper.call(this, aMIMEType, null);
 }
 
 FeedHandlerInfo.prototype = {
   __proto__: HandlerInfoWrapper.prototype,
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // Convenience Utils
 
   _converterSvc:
     Cc["@mozilla.org/embeddor.implemented/web-content-handler-registrar;1"].
     getService(Ci.nsIWebContentConverterService),
 
   _shellSvc: AppConstants.HAVE_SHELL_SERVICE ? getShellService() : null,
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // nsIHandlerInfo
 
   get description() {
     return this.element("bundlePreferences").getString(this._appPrefLabel);
   },
 
   get preferredApplicationHandler() {
     switch (this.element(this._prefSelectedReader).value) {
@@ -718,25 +718,25 @@ FeedHandlerInfo.prototype = {
   // We use this to suppress notification-triggered updates to the list when
   // we make changes that may spawn such updates, specifically when we change
   // the action for the feed type, which results in feed preference updates,
   // which spawn "pref changed" notifications that would otherwise cause us
   // to rebuild the view unnecessarily.
   _storingAction: false,
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // nsIMIMEInfo
 
   get primaryExtension() {
     return "xml";
   },
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // Storage
 
   // Changes to the preferred action and handler take effect immediately
   // (we write them out to the preferences right as they happen),
   // so we when the controller calls store() after modifying the handlers,
   // the only thing we need to store is the removal of possible handlers
   // XXX Should we hold off on making the changes until this method gets called?
   store: function() {
@@ -754,17 +754,17 @@ FeedHandlerInfo.prototype = {
         app.QueryInterface(Ci.nsIWebContentHandlerInfo);
         this._converterSvc.removeContentHandler(app.contentType, app.uri);
       }
     }
     this._possibleApplicationHandlers._removed = [];
   },
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // Icons
 
   get smallIcon() {
     return this._smallIcon;
   }
 
 };
 
@@ -834,17 +834,17 @@ var pdfHandlerInfo = {
   _handlerChanged: TOPIC_PDFJS_HANDLER_CHANGED,
   _appPrefLabel: "portableDocumentFormat",
   get enabled() {
     return !Services.prefs.getBoolPref(PREF_PDFJS_DISABLED);
   },
 };
 
 
-//****************************************************************************//
+//* ***************************************************************************//
 // Prefpane Controller
 
 var gApplicationsPane = {
   // The set of types the app knows how to handle.  A hash of HandlerInfoWrapper
   // objects, indexed by type.
   _handledTypes: {},
 
   // The list of types we can show, sorted by the sort column/direction.
@@ -858,17 +858,17 @@ var gApplicationsPane = {
 
   // A count of the number of times each visible type description appears.
   // We use these counts to determine whether or not to annotate descriptions
   // with their types to distinguish duplicate descriptions from each other.
   // A hash of integer counts, indexed by string description.
   _visibleTypeDescriptionCount: {},
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // Convenience & Performance Shortcuts
 
   // These get defined by init().
   _brandShortName : null,
   _prefsBundle    : null,
   _list           : null,
   _filter         : null,
 
@@ -883,17 +883,17 @@ var gApplicationsPane = {
 
   _handlerSvc   : Cc["@mozilla.org/uriloader/handler-service;1"].
                   getService(Ci.nsIHandlerService),
 
   _ioSvc        : Cc["@mozilla.org/network/io-service;1"].
                   getService(Ci.nsIIOService),
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // Initialization & Destruction
 
   init: function() {
     function setEventListener(aId, aEventType, aCallback)
     {
       document.getElementById(aId)
               .addEventListener(aEventType, aCallback.bind(gApplicationsPane));
     }
@@ -986,30 +986,30 @@ var gApplicationsPane = {
 
     this._prefSvc.removeObserver(PREF_AUDIO_FEED_SELECTED_APP, this);
     this._prefSvc.removeObserver(PREF_AUDIO_FEED_SELECTED_WEB, this);
     this._prefSvc.removeObserver(PREF_AUDIO_FEED_SELECTED_ACTION, this);
     this._prefSvc.removeObserver(PREF_AUDIO_FEED_SELECTED_READER, this);
   },
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // nsISupports
 
   QueryInterface: function(aIID) {
     if (aIID.equals(Ci.nsIObserver) ||
         aIID.equals(Ci.nsIDOMEventListener ||
         aIID.equals(Ci.nsISupports)))
       return this;
 
     throw Cr.NS_ERROR_NO_INTERFACE;
   },
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // nsIObserver
 
   observe: function (aSubject, aTopic, aData) {
     // Rebuild the list when there are changes to preferences that influence
     // whether or not to show certain entries in the list.
     if (aTopic == "nsPref:changed" && !this._storingAction) {
       // These two prefs alter the list of visible types, so we have to rebuild
       // that list when they change.
@@ -1021,27 +1021,27 @@ var gApplicationsPane = {
 
       // All the prefs we observe can affect what we display, so we rebuild
       // the view when any of them changes.
       this._rebuildView();
     }
   },
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // nsIDOMEventListener
 
   handleEvent: function(aEvent) {
     if (aEvent.type == "unload") {
       this.destroy();
     }
   },
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // Composed Model Construction
 
   _loadData: function() {
     this._loadFeedHandler();
     this._loadInternalHandlers();
     this._loadPluginHandlers();
     this._loadApplicationHandlers();
   },
@@ -1126,17 +1126,17 @@ var gApplicationsPane = {
         this._handledTypes[type] = handlerInfoWrapper;
       }
 
       handlerInfoWrapper.handledOnlyByPlugin = false;
     }
   },
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // View Construction
 
   _rebuildVisibleTypes: function() {
     // Reset the list of visible types and the visible type description counts.
     this._visibleTypes = [];
     this._visibleTypeDescriptionCount = {};
 
     // Get the preferences that help determine what types to show.
@@ -1550,17 +1550,17 @@ var gApplicationsPane = {
         break;
       case Ci.nsIHandlerInfo.saveToDisk:
         menu.selectedItem = saveMenuItem;
         break;
     }
   },
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // Sorting & Filtering
 
   _sortColumn: null,
 
   /**
    * Sort the list when the user clicks on a column header.
    */
   sort: function (event) {
@@ -1623,17 +1623,17 @@ var gApplicationsPane = {
   },
 
   focusFilterBox: function() {
     this._filter.focus();
     this._filter.select();
   },
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // Changes
 
   onSelectAction: function(aActionItem) {
     this._storingAction = true;
 
     try {
       this._storeAction(aActionItem);
     }
--- a/browser/components/preferences/in-content/subdialogs.js
+++ b/browser/components/preferences/in-content/subdialogs.js
@@ -54,17 +54,17 @@ var gSubDialog = {
       let args = Array.from(arguments);
       this._closingPromise.then(() => {
         this.open.apply(this, args);
       });
       return;
     }
     this._addDialogEventListeners();
 
-    let features = (!!aFeatures ? aFeatures + "," : "") + "resizable,dialog=no,centerscreen";
+    let features = (aFeatures ? aFeatures + "," : "") + "resizable,dialog=no,centerscreen";
     let dialog = window.openDialog(aURL, "dialogFrame", features, aParams);
     if (aClosingCallback) {
       this._closingCallback = aClosingCallback.bind(dialog);
     }
 
     this._closingEvent = null;
     this._isClosing = false;
     this._openedURL = aURL;
@@ -333,17 +333,17 @@ var gSubDialog = {
     if (aEvent.keyCode != aEvent.DOM_VK_TAB ||
         aEvent.ctrlKey || aEvent.altKey || aEvent.metaKey) {
       return;
     }
 
     let fm = Services.focus;
 
     function isLastFocusableElement(el) {
-      //XXXgijs unfortunately there is no way to get the last focusable element without asking
+      // XXXgijs unfortunately there is no way to get the last focusable element without asking
       // the focus manager to move focus to it.
       let rv = el == fm.moveFocus(gSubDialog._frame.contentWindow, null, fm.MOVEFOCUS_LAST, 0);
       fm.setFocus(el, 0);
       return rv;
     }
 
     let forward = !aEvent.shiftKey;
     // check if focus is leaving the frame (incl. the close button):
--- a/browser/components/preferences/in-content/sync.js
+++ b/browser/components/preferences/in-content/sync.js
@@ -115,17 +115,17 @@ var gSyncPane = {
                   "weave:service:start-over:finish",
                   "weave:service:setup-complete",
                   "weave:service:logout:finish",
                   FxAccountsCommon.ONVERIFIED_NOTIFICATION,
                   FxAccountsCommon.ONLOGIN_NOTIFICATION,
                   FxAccountsCommon.ON_PROFILE_CHANGE_NOTIFICATION,
                   ];
     // Add the observers now and remove them on unload
-    //XXXzpao This should use Services.obs.* but Weave's Obs does nice handling
+    // XXXzpao This should use Services.obs.* but Weave's Obs does nice handling
     //        of `this`. Fix in a followup. (bug 583347)
     topics.forEach(function (topic) {
       Weave.Svc.Obs.add(topic, this.updateWeavePrefs, this);
     }, this);
 
     window.addEventListener("unload", function() {
       topics.forEach(function (topic) {
         Weave.Svc.Obs.remove(topic, this.updateWeavePrefs, this);
--- a/browser/components/search/test/browser_426329.js
+++ b/browser/components/search/test/browser_426329.js
@@ -148,17 +148,17 @@ add_task(function* testAltReturn() {
   yield BrowserTestUtils.openNewForegroundTab(gBrowser, () => {
     EventUtils.synthesizeKey("VK_RETURN", { altKey: true });
   });
 
   is(gBrowser.tabs.length, preTabNo + 1, "Alt+Return key added new tab");
   is(gBrowser.currentURI.spec, expectedURL(searchBar.value), "testAltReturn opened correct search page");
 });
 
-//Shift key has no effect for now, so skip it
+// Shift key has no effect for now, so skip it
 add_task(function* testShiftAltReturn() {
   return;
 
   yield* prepareTest();
 
   let url = expectedURL(searchBar.value);
 
   let newTabPromise = BrowserTestUtils.waitForNewTab(gBrowser, url);
--- a/browser/components/search/test/browser_searchbar_openpopup.js
+++ b/browser/components/search/test/browser_searchbar_openpopup.js
@@ -276,17 +276,17 @@ add_task(function* contextmenu_closes_po
   isnot(searchPopup.getAttribute("showonlysettings"), "true", "Should show the full popup");
 
   is(Services.focus.focusedElement, textbox.inputField, "Should have focused the search bar");
   is(textbox.selectionStart, 0, "Should have selected all of the text");
   is(textbox.selectionEnd, 3, "Should have selected all of the text");
 
   promise = promiseEvent(searchPopup, "popuphidden");
 
-  //synthesizeKey does not work with VK_CONTEXT_MENU (bug 1127368)
+  // synthesizeKey does not work with VK_CONTEXT_MENU (bug 1127368)
   EventUtils.synthesizeMouseAtCenter(textbox, { type: "contextmenu", button: null });
 
   yield promise;
 
   let contextPopup =
     document.getAnonymousElementByAttribute(textbox.inputField.parentNode,
                                             "anonid", "input-box-contextmenu");
   promise = promiseEvent(contextPopup, "popuphidden");
--- a/browser/components/search/test/head.js
+++ b/browser/components/search/test/head.js
@@ -50,17 +50,17 @@ function promiseEvent(aTarget, aEventNam
     return true;
   }
 
   return BrowserTestUtils.waitForEvent(aTarget, aEventName, false, cancelEvent);
 }
 
 function promiseNewEngine(basename, options = {}) {
   return new Promise((resolve, reject) => {
-    //Default the setAsCurrent option to true.
+    // Default the setAsCurrent option to true.
     let setAsCurrent =
       options.setAsCurrent == undefined ? true : options.setAsCurrent;
     info("Waiting for engine to be added: " + basename);
     Services.search.init({
       onInitComplete: function() {
         let url = getRootDirectory(gTestPath) + basename;
         let current = Services.search.currentEngine;
         Services.search.addEngine(url, null, options.iconURL || "", false, {
--- a/browser/components/translation/test/unit/test_cld2.js
+++ b/browser/components/translation/test/unit/test_cld2.js
@@ -33,43 +33,39 @@ const kTeststr_am_Ethi = " ለመጠይቅ ወደ እስክንድርያ ላኩዋቸውና የእስክንድርያ ጳጳስ አቴናስዮስ ፍሬምንጦስን እራሳቸውን ሾመው ልከዋል ከዚያ እስከ ዓ ም ድረስ የኢትዮጵያ አቡነ";
 const kTeststr_ar_Arab = "احتيالية بيع أي حساب";
 const kTeststr_as_Beng = "অঞ্চল নতুন সদস্যবৃন্দ সকলোৱে ভৰ্তি হব পাৰে মুল পৃষ্ঠা জন লেখক গুগ ল দল সাৰাংশ ই পত্ৰ টা বাৰ্তা এজন";
 const kTeststr_ay_Latn = " aru wijar aru ispañula ukaran aru witanam aru kurti aru kalis aru warani aru malta aru yatiyawi niya jakitanaka isluwiñ aru lmir phuran aru masirunan aru purtukal aru kruwat aru jakira urtu aru inklisa pirsan aru suyku aru malay aru jisk aptayma thaya";
 const kTeststr_az_Arab = " آذربایجان دا انسان حاقلاری ائوی آچیلاجاق ب م ت ائلچيسي برمه موخاليفتي نين ليدئري ايله گؤروشه بيليب ترس شوونيسم فارس از آزادي ملتهاي تورکمن";
 const kTeststr_az_Latn = " a az qalıb breyn rinq intellektual oyunu üzrə yarışın zona mərhələləri keçirilib miq un qalıqlarının dənizdən çıxarılması davam edir məhəmməd peyğəmbərin karikaturalarını çap edən qəzetin baş redaktoru iş otağında ölüb";
 const kTeststr_ba_Cyrl = " арналђан бындай ђилми эш тіркињлњ тњјге тапєыр нњшер ителњ ғинуар бєхет именлектє етешлектє ауыл ўќмерџєре хеџмєт юлын ћайлаѓанда";
 const kTeststr_be_Cyrl = " а друкаваць іх не было тэхнічна магчыма бліжэй за вільню тым самым часам нямецкае кіраўніцтва прапаноўвала апроч ўвядзення лацінкі яе";
 const kTeststr_bg_Cyrl = " а дума попада в състояние на изпитание ключовите думи с предсказана малко под то изискване на страниците за търсене в";
-//const kTeststr_bh_Deva = " विकिपीडिया इंटरनेट आधारित एक मुक्त ज्ञानकोष परियोजना ह ई विकि के रुप मेँ बा यानी एगो अईसन जाल पृष्ठ जे सभन के संपादन करे के छूट देवेला विकिपीडिया शब्द विकि अउर इनसाइक्लोपीडिया ज्ञानकोष शब्दन के मिला के बनल बा विकिपीडिया एक बहुभाषीय प्रकल्प ह अउर स्वयंसेवकन के सहकार से निर्मित बा जेहु के भी इंटरनेट तक पहुँच बा ऊ विकिपीडिया पर लिख सकत बा अउर लेखन के संपादन कर सकत बा";
 // From 10% testing part of new lang=bh scrape
 const kTeststr_bh_Deva = "काल में उनका हमला से बचे खाती एहिजा भाग के अइले आ भोजपुर नाम से नगर बसवले. एकरा बारे में विस्तार से जानकारी नीचे दीहल गइल बा. बाकिर आश्चर्यजनक रूप से मालवा के राजा भोज के बिहार आवे आ भोजपुर नगर बसावे आ चाहे भोजपुरी के साथे उनकर कवनो संबंध होखे के कवनो जानकारी भोपाल के भोज संस्थान आ चाहे मध्य प्रदेश के इतिहासकार लोगन के तनिको नइखे. हालांकि ऊ सब लोग एह बात के मानत बा कि एकरा बारे में अबहीं तकले मूर्ति बनवइलें. राजा भोज के जवना जगहा पऽ वाग्देवी के दर्शन भइल रहे, ओही स्थान पऽ एह मूर्ति के स्थापना कइल गइल. अब अगर एह मंदिर के एह शिलालेख के तस्वीर (पृष्ठ संख्या 33 पऽ प्रकाशित) रउआ धेयान से देखीं तऽ एकरा पऽ कैथी लिपि में -सीताराम- लिखल साफ लउकत बा. कैथी भोजपुरी के बहुत प्रचलित लिपि रहल बिया. एकरा बारे में कवनो शंका संदेह बिहार-यूपी के जानकार लोगन में नइखे. एल. एस. एस. वो माले के लिखल पढ़ीं ";
 
 const kTeststr_bi_Latn = " king wantaem nomo hem i sakem setan mo ol rabis enjel blong hem oli aot long heven oli kamdaon long wol taswe ol samting oli kam nogud olgeta long wol ya stat long revelesen ol faet kakae i sot ol sik mo fasin blong brekem loa oli kam antap olgeta samting";
 const kTeststr_blu_Latn = " Kuv hlub koj txawm lub ntuj yuav si ntshi nphaus los kuv tsis ua siab nkaug txawm ntiab teb yuav si ntshi nphaus los kuv tseem ua lon tsaug vim kuv hlub koj tag lub siab";
 const kTeststr_blu_Latn2 = "Kuv hnov Txhiaj Xeeb Vaj, co-owner of Hmong Village Shopping Center, hais ua hnub ua hmo tias kom Hmoob yuav tsum txhawb Hmoob thiab listed cov mini-shops uas nyob rau hauv nws lub MALL txhua txhua kom sawv daws mus txhawb, tiam sis uas cas zaum twg twb pom nws mus kav kiav hauv taj laj qhabmeem (Sun Foods) xwb tiag. Nag hmo kuv pom nws mus shopping nrog nws poj niam hauv Sun Foods. Thaum tawm mus txog nraum parking lot kuv thiaj txhob txwm mus ze ze seb ua li nws mus yuav dab tsi tiag, thiab seb tej uas nws yuav ntawd puas muaj nyob ntawm tej kiab khw Hmoob. Surprised!!! Vuag.... txhua yam nws yuav hauv Sun Foods peb Hmoob cov khw yeej muaj tag nrho. Peb niaj hnub nqua hu kom Hmoob yuav tsum pab Hmoob yog pab li no lod?";
-//const kTeststr_bn_Beng = " ংখ্যা নমুনায়ন বিন্যাস পরিসংখ্যানিক মডেল পরিসংখ্যানিক সিদ্ধান্ত ফাংশন পরিসংখ্যানিক";
 // From 10% testing part of new lang=bn scrape
 const kTeststr_bn_Beng = "গ্যালারির ৩৮ বছর পূর্তিতে মূল্যছাড় অর্থনীতি বিএনপির ওয়াক আউট তপন চৌধুরী হারবাল অ্যাসোসিয়েশনের সভাপতি আন্তর্জাতিক পরামর্শক বোর্ড দিয়ে শরিয়াহ্ ইনন্ডেক্স করবে সিএসই মালিকপক্ষের কান্না, শ্রমিকের অনিশ্চয়তা মতিঝিলে সমাবেশ নিষিদ্ধ: এফবিসিসিআইয়ের ধন্যবাদ বিনোদন বিশেষ প্রতিবেদন বাংলালিংকের গ্র্যান্ডমাস্টার সিজন-৩ ব্রাজিলে বিশ্বকাপ ফুটবল আয়োজনবিরোধী বিক্ষোভ দেশের নিরাপত্তার  চেয়ে অনেক বেশি সচেতন । প্রার্থীদের দক্ষতা  ও যোগ্যতার পাশাপাশি তারা জাতীয় ইস্যুগুলোতে প্রাধান্য দিয়েছেন । ” পাঁচটি সিটিতে ২০ লাখ ভোটারদের দিয়ে জাতীয় নির্বাচনে ৮ কোটি ভোটারদের সঙ্গে তুলনা করা যাবে কি একজন দর্শকের এমন প্রশ্নে জবাবে আব্দুল্লাহ আল নোমান বলেন , “ এই পাঁচটি সিটি কর্পোরেশন নির্বাচন দেশের পাঁচটি বড় বিভাগের প্রতিনিধিত্ব করছে । এছাড়া এখানকার ভোটার রা সবাই সচেতন । তারা";
 
-//const kTeststr_bo_Tibt = " གང ནི ཀུན ལ སྦྱར པ དང ཅན ལྡན བདག པོའི སྒྲ ག ད བ ས ན མ པ ང འ ར ལ མཐའ མེད པ བདག པོའི སྒྲ ལ པ ཉིད དོ མ མི མིན";
 // From 10% testing part of new lang=bo scrape
 const kTeststr_bo_Tibt = " ་གྱིས་ཁ་ཆེའི་ཕྱག་འཚལ་ཁང་ཞིག་བཤིག་སྲིད་པ། ཡར་ཀླུང་གཙང་པོར་ཆ ུ་མཛོང་བརྒྱག་རྒྱུའི་ལས་འཆར་ལ་རྒྱ་གར་གྱི་སེམས་ཚབས། རྒྱ་གརགྱི་མཚོ་འོག་དམག་གྲུར་སྦར་གས་བྱུང་བ། པ་ཀི་སི་ཏན་གྱིས་རྒྱ་གར་ལ་མི་སེར་བསད་པའི་སྐྱོན་འཛུགས་བྱས་པ། རྩོམ་ཡིག་མང་བ། འབྲེལ་མཐུད་བརྒྱུད་ལམ། ཐོན་སྐྱེད་དང་སྲི་ཞུ། ་ཐོག་དེབ་བཞི་ དཔར་འགྲེམས་གནང་ཡོད་པ་དང་བོད་ཡིག་དྲ་ཚིགས་ཁག་ནང་ལ་ཡང་རྩོམ་ཡང་ཡང་བྲིས་གནང་མཁན་རེད། ལེ་ཚན་ཁག ལེ་ཚན་ཁག འབྲེལ་ཡོད། འགྲེམ་སྟོན། རྒྱུད་ལམ་སྣ་མང་ཡིག་མཛོད། བཀོལ་སྤྱོད་པའི་འཇོག་ཡུལ་དྲ་ངོས། སྔོན་མ། རྗེས་མ། བསྟན་འཛིན་བདེ་སྐྱིད། ཚེ་རིང་རྣམ་རྒྱལ། བསྟན་འཛིན་ངག་དབང་། ཡོལ་གདོང་ཚེ་རིང་ལྷག་པ།  ་དབང་ ཕྱུག་གཉིས་ཀྱིས་བརྗོད་གཞི་བྱེ་བྲག་པ་ཞིག་ལ་བགྲོ་གླེང་གཏིང་ཟབ་བྱེད་པའི་གཟའ་ འཁོར་གཉིས་རེའི་མཚམས་ཀྱི་ལེ་ཚན་ཞིག་ཡིན། དཔྱད་ཞིབ་ཀྱིས་རྒྱ་ནག་ནང་ཁུལ་གྱི་འགྱུར་ལྡོག་དང༌། རྒྱ་ནག་དང་རྒྱལ་སྤྱིའི་འབྲེལ་བར་དམིགས་སུ་བཀར་ནས་བགྲོ་གླེང་བྱེད་ཀྱི་ཡོད།། རྒྱང་སྲིང་དུས་ཚོད།";
 
 const kTeststr_br_Latn = " a chom met leuskel a ra e blas da jack irons dilabour hag aet kuit eus what is this dibab a reont da c houde michael beinhorn evit produiñ an trede pladenn kavet e vez ar ganaouennoù buhan ha buhan ganto setu stummet ar bladenn adkavet e vez enni funk";
 const kTeststr_bs_Cyrl = "историја босне књ историја босне књ историја босне књ историја босне књ ";
-//const kTeststr_bs_Latn = " a radi bržeg rada pošto rom radi sporije nego ram izvorni rom se isključuje a dio ram a se rezerviše te se u njega ne ploča procesor ram memorija grafička kartica zvučna kartica modem mrežna kartica napojna jedinica uređaji za pohranjivanje";
 // From 10% testing part of new lang=bs scrape
 const kTeststr_bs_Latn = "Novi predsjednik Mešihata Islamske zajednice u Srbiji (IZuS) i muftija dr. Mevlud ef. Dudić izjavio je u intervjuu za Anadolu Agency (AA) kako je uvjeren da će doći do vraćanja jedinstva među muslimanima i unutar Islamske zajednice na prostoru Sandžaka, te da je njegova ruka pružena za povratak svih u okrilje Islamske zajednice u Srbiji nakon skoro sedam godina podjela u tom dijelu Srbije. Dudić je za predsjednika Mešihata IZ u Srbiji izabran 4. januara, a zvanična inauguracija će biti obavljena u prvoj polovini februara. Kako se očekuje, prisustvovat će joj i reisu-l-ulema Islamske zajednice u Srbiji Husein ef. Kavazović koji će i zvanično promovirati Dudića u novog prvog čovjeka IZ u Srbiji. Dudić će danas boraviti u prvoj zvaničnoj posjeti reisu Kavazoviću, što je njegov privi simbolični potez nakon imenovanja. ";
 
 const kTeststr_ca_Latn = "al final en un únic lloc nhorabona l correu electrònic està concebut com a eina de productivitat aleshores per què perdre el temps arxivant missatges per després intentar recordar on els veu desar i per què heu d eliminar missatges importants per l";
 const kTeststr_ceb_Latn = "Ang Sugbo usa sa mga labing ugmad nga lalawigan sa nasod. Kini ang sentro sa komersyo, edukasyon ug industriya sa sentral ug habagatang dapit sa kapupod-an. Ang mipadayag sa Sugbo isip ikapito nga labing nindot nga pulo sa , ang nag-inusarang pulo sa Pilipinas nga napasidunggan sa maong magasin sukad pa sa tuig";
 const kTeststr_ceb_Latn2 = "Ang mga komyun sa Pransiya duol-duol sa inkorporadong mga lungsod ug mga dakbayan sa Estados Unidos. Wala kini susamang istruktura sa Hiniusang Gingharian (UK) tungod kay ang estado niini taliwala sa di-metropolitan nga distrito ug sa sibil nga parokya. Wala usab kini susamang istruktura sa Pilipinas.";
 const kTeststr_chr_Cher = "ᎠᎢᏍᎩ ᎠᏟᎶᏍᏗ ᏥᏄᏍᏛᎩ ᎦᎫᏍᏛᏅᎯ ᎾᎥᎢ";
 const kTeststr_co_Latn = " a prupusitu di risultati for utilizà a scatula per ricercà ind issi risultati servore errore u servore ha incuntratu una errore pruvisoria é ùn ha pussutu compie a vostra dumanda per piacè acimenta dinò ind una minuta tuttu listessu ligami truvà i";
-const  kTeststr_crs_Latn = "Sesel ou menm nou sel patri. Kot nou viv dan larmoni. Lazwa, lanmour ek lape. Nou remersye Bondye. Preserv labote nou pei. Larises nou losean. En leritaz byen presye. Pour boner nou zanfan. Reste touzour dan linite. Fer monte nou paviyon. Ansanm pou tou leternite. Koste Seselwa!";
+const kTeststr_crs_Latn = "Sesel ou menm nou sel patri. Kot nou viv dan larmoni. Lazwa, lanmour ek lape. Nou remersye Bondye. Preserv labote nou pei. Larises nou losean. En leritaz byen presye. Pour boner nou zanfan. Reste touzour dan linite. Fer monte nou paviyon. Ansanm pou tou leternite. Koste Seselwa!";
 const kTeststr_cs_Latn = " a akci opakujte film uložen vykreslit gmail tokio smazat obsah adresáře nelze načíst systémový profil jednotky smoot okud používáte pro určení polokoule značky z západ nebo v východ používejte nezáporné hodnoty zeměpisné délky nelze";
 const kTeststr_cy_Latn = " a chofrestru eich cyfrif ymwelwch a unwaith i chi greu eich cyfrif mi fydd yn cael ei hysbysu o ch cyfeiriad ebost newydd fel eich bod yn gallu cadw mewn cysylltiad drwy gmail os nad ydych chi wedi clywed yn barod am gmail mae n gwasanaeth gwebost";
 const kTeststr_da_Latn = " a z tallene og punktummer der er tilladte log ud angiv den ønskede adgangskode igen november gem personlige oplysninger kontrolspørgsmål det sidste tegn i dit brugernavn skal være et bogstav a z eller tal skriv de tegn du kan se i billedet nedenfor";
 const kTeststr_de_Latn = " abschnitt ordner aktivieren werden die ordnereinstellungen im farbabschnitt deaktiviert öchten sie wirklich fortfahren eldtypen angeben optional n diesem schritt geben sie für jedesfeld aus dem datenset den typ an ieser schritt ist optional eldtypen";
 const kTeststr_dv_Thaa = " ހިންދީ ބަހުން ވާހަކަ ދައްކާއިރު ދެވަނަ ބަހެއްގެ ގޮތުގައާއި އެނޫން ގޮތްގޮތުން ހިންދީ ބަހުން ވާހަކަ ދައްކާ މީހުންގެ އަދަދު މިލިއަނަށް";
 const kTeststr_dz_Tibt = " རྩིས བརྐྱབ ཚུལ ལྡན དང ངེས བདེན སྦ སྟོན ནིའི དོན ལུ ཁྱོད གུག ཤད ལག ལེན འཐབ དགོ ག དང ཨིན པུཊི གྲལ ཐིག གུ";
 const kTeststr_ee_Latn = "Yi (Di tanya sia) tatia akɔ wò ayi axa yeye dzi kple tanya si sɔ kple esi wòŋlɔ ɖe goa me, negbe axaa ɖe li kpakple tanya mawo xoxo ko. Teƒe le axa yeye sia dzi si wòateŋu atia na kpekpeɖeŋu kple nuwoŋlɔŋlɔ ne anɔ hahiãm na wò. Mehiã be na gbugbɔ ava afii na axa yeye gɔmedzedze o. Woateŋu adze wo gɔme kple nuŋɔŋlɔ dzẽwo tatia. Megavɔ̃ na nuyeyewo gɔmedzedze kroa o.";
 const kTeststr_el_Grek = " ή αρνητική αναζήτηση λέξης κλειδιού καταστήστε τις μεμονωμένες λέξεις κλειδιά περισσότερο στοχοθετημένες με τη μετατροπή τους σε";
@@ -94,23 +90,21 @@ const kTeststr_gv_Latn = " and not ripe 
 const kTeststr_ha_Latn = " a cikin a kan sakamako daga sakwannin a kan sakamako daga sakwannin daga ranar zuwa a kan sakamako daga guda daga ranar zuwa a kan sakamako daga shafukan daga ranar zuwa a kan sakamako daga guda a cikin last hour a kan sakamako daga guda daga kafar";
 const kTeststr_haw_Latn = "He puke noiʻi kūʻikena kūnoa ʻo Wikipikia. E ʻoluʻolu nō, e hāʻawi mai i kāu ʻike, kāu manaʻo, a me kou leo no ke kūkulu ʻana a me ke kākoʻo ʻana mai i ka Wikipikia Hawaiʻi. He kahua pūnaewele Hawaiʻi kēia no ka hoʻoulu ʻana i ka ʻike Hawaiʻi. Inā hiki iā ʻoe ke ʻōlelo Hawaiʻi, e ʻoluʻolu nō, e kōkua mai a e hoʻololi i nā ʻatikala ma ʻaneʻi, a pono e haʻi aku i kou mau hoa aloha e pili ana i ka Wikipikia Hawaiʻi. E ola mau nō ka ʻōlelo Hawaiʻi a mau loa aku.";
 const kTeststr_hi_Deva = " ं ऐडवर्ड्स विज्ञापनों के अनुभव पर आधारित हैं और इनकी मदद से आपको अपने विज्ञापनों का अधिकतम लाभ";
 const kTeststr_hr_Latn = "Posljednja dva vladara su Kijaksar (Κυαξαρης; 625-585 prije Krista), fraortov sin koji će proširiti teritorij Medije i Astijag. Kijaksar je imao kćer ili unuku koja se zvala Amitis a postala je ženom Nabukodonosora II. kojoj je ovaj izgradio Viseće vrtove Babilona. Kijaksar je modernizirao svoju vojsku i uništio Ninivu 612. prije Krista. Naslijedio ga je njegov sin, posljednji medijski kralj, Astijag, kojega je detronizirao (srušio sa vlasti) njegov unuk Kir Veliki. Zemljom su zavladali Perzijanci.";
 const kTeststr_ht_Latn = " ak pitit tout sosyete a chita se pou sa leta dwe pwoteje yo nimewo leta fèt pou li pwoteje tout paran ak pitit nan peyi a menm jan kit paran yo marye kit yo pa marye tout manman ki fè pitit leta fèt pou ba yo konkoul menm jan tou pou timoun piti ak pou";
 const kTeststr_hu_Latn = " a felhasználóim a google azonosító szöveget ikor látják a felhasználóim a google azonosító szöveget felhasználók a google azonosító szöveget fogják látni minden tranzakció után ha a vásárlását regisztrációját oldalunk";
 const kTeststr_hy_Armn = " ա յ եվ նա հիացած աչքերով նայում է հինգհարկանի շենքի տարօրինակ փոքրիկ քառակուսի պատուհաններին դեռ մենք շատ ենք հետամնաց ասում է նա այսպես է";
 const kTeststr_ia_Latn = " super le sitos que tu visita isto es necessari pro render disponibile alcun functionalitates del barra de utensiles a fin que nos pote monstrar informationes ulterior super un sito le barra de utensiles debe dicer a nos le";
-//const kTeststr_id_Latn = "Geng: Pengembaraan Bermula adalah film animasi 3D CGI pertama yang diproduksi di Malaysia. Film ini dibuat oleh Les' Copaque Production (LCP) dan dirilis di bioskop-bioskop seluruh Malaysia pada 12 Februari 2009. Film Geng pertama kali diluncurkan dalam sebuah acara peluncuran pada 11 September 2007 bersama dengan serial animasi pendek Upin & Ipin yang berhubungan dengan film tersebut. Pembuatan film ini didukung oleh berbagai pihak seperti Kementerian Sains, Teknologi dan Inovasi Malaysia (MOSTI) dengan memberi bantuan berupa dana sebesar RM1 juta.";
 // From 10% testing part of new lang=id scrape
 const kTeststr_id_Latn = "berdiri setelah pengurusnya yang berusia 83 tahun, Fayzrahman Satarov, mendeklarasikan diri sebagai nabi dan rumahnya sebagai negara Islam Satarov digambarkan sebagai mantan ulama Islam  tahun 1970-an. Pengikutnya didorong membaca manuskripnya dan kebanyakan dilarang meninggalkan tempat persembunyian bawah tanah di dasar gedung delapan lantai mereka. Jaksa membuka penyelidikan kasus kriminal pada kelompok itu dan menyatakan akan membubarkan kelompok kalau tetap melakukan kegiatan ilegal seperti mencegah anggotanya mencari bantuan medis atau pendidikan. Sampai sekarang pihak berwajib belum melakukan penangkapan meskipun polisi mencurigai adanya tindak kekerasan pada anak. Pengadilan selanjutnya akan memutuskan apakah anak-anak diizinkan tetap tinggal dengan orang tua mereka. Kazan yang berada sekitar 800 kilometer di timur Moskow merupakan wilayah Tatarstan yang";
 
 const kTeststr_ie_Latn = " abhorre exceptiones in li derivation plu cardinal por un l i es li regularità del flexion conjugation ples comparar latino sine flexione e li antiqui projectes naturalistic queles have quasi null regules de derivation ma si on nu examina li enunciationes";
 const kTeststr_ig_Latn = "Chineke bụ aha ọzọ ndï omenala Igbo kpọro Chukwu. Mgbe ndị bekee bịara, ha mee ya nke ndi Christian. N'echiche ndi ekpere chi Omenala Ndi Igbo, Christianity, Judaism, ma Islam, Chineke nwere ọtụtụ utu aha, ma nwee nanị otu aha. Ụzọ abụọ e si akpọ aha ahụ bụ Jehovah ma Ọ bụ Yahweh. Na ọtụtụ Akwụkwọ Nsọ, e wepụla aha Chineke ma jiri utu aha bụ Onyenwe Anyị ma ọ bụ Chineke dochie ya. Ma mgbe e dere akwụkwọ nsọ, aha ahụ bụ Jehova pụtara n’ime ya, ihe dị ka ugboro pụkụ asaa(7,000).";
-//const kTeststr_ik_Latn = " kuubuuraqabniqsuq ataruamik colville mi aasii tavrani siku kilaabman sulukpaukkat makua niksisugrufagivut tavrani sunaimña atifa quaqqat ii quaqqat aasii ukiabmagu utiqhuta tamaufa utqiabvifñun aasiiñ tatpaaffaqapta tuvaaqatinifarufa aasiiñ";
 // From 10% testing part of new lang=ik scrape
 const kTeststr_ik_Latn = "sabvaqjuktuq sabvaba atiqaqpa atiqaqpa ibiq iebiq ixafich niuqtulgiññatif uvani natural gas tatpikka ufasiksigiruaq maaffa savaannafarufa mi tatkivani navy qanuqjugugguuq taaptuma inna uqsrunik ivaqjiqhutik       taktuk allualiuqtuq sigukun nanuq puuvraatuq taktuum amugaa kalumnitigun nanuq agliruq allualiuqtuq";
 
 const kTeststr_is_Latn = " a afköst leitarorða þinna leitarorð neikvæð leitarorð auglýsingahópa byggja upp aðallista yfir ný leitarorð fyrir auglýsingahópana og skoða ítarleg gögn um árangur leitarorða eins og samkeppni auglýsenda og leitarmagn er krafist notkun";
 const kTeststr_it_Latn = " a causa di un intervento di manutenzione del sistema fino alle ore circa ora legale costa del pacifico del novembre le campagne esistenti continueranno a essere pubblicate come di consueto anche durante questo breve periodo di inattività ci scusiamo per";
 const kTeststr_iu_Cans = "ᐃᑯᒪᒻᒪᑦ ᕿᓈᖏᓐᓇᓲᖑᒻᒪᑦ ᑎᑎᖅᑕᓕᒫᖅᓃᕕᑦ ᑎᑦᕆᐊᑐᓐᖏᑦᑕᑎᑦ ᑎᑎᖅᑕᑉᐱᑦ ᓯᕗᓂᖓᓂ ᑎᑎᖅᖃᖅ ᑎᑎᕆᐊᑐᓐᖏᑕᐃᑦ ᕿᓂᓲᖑᔪᒍᑦ ᑎᑎᖅᑕᓕᒫᖅᓃᕕᑦ";
 const kTeststr_he_Hebr = " או לערוך את העדפות ההפצה אנא עקוב אחרי השלבים הבאים כנס לחשבון האישי שלך ב";
 const kTeststr_ja_Hani = " このペ ジでは アカウントに指定された予算の履歴を一覧にしています それぞれの項目には 予算額と特定期間のステ タスが表示されます 現在または今後の予算を設定するには";
@@ -119,17 +113,16 @@ const kTeststr_ka_Geor = " ა ბირთვიდან მიღებული ელემენტი მენდელეევის პერიოდულ სიტემაში გადაინაცვლებს ორი უჯრით";
 const kTeststr_kha_Latn = " kaba jem jai sa sngap thuh ia ki bynta ba sharum naka sohbuin jong phi nangta sa pynhiar ia ka kti kadiang jong phi sha ka krung jong phi bad da kaba pyndonkam kumjuh ia ki shympriahti jong phi sa sngap thuh shapoh ka tohtit jong phi pyndonkam ia kajuh ka";
 const kTeststr_kk_Arab = " ﺎ ﻗﻴﺎﻧﺎﺕ ﺑﻮﻟﻤﺎﻳﺪﻯ ﺑﯘﻝ ﭘﺮﻭﺗﺴﻪﺳﯩﻦ ﻳﺎﻋﻨﻲ ﻗﺎﻻ ﻭﻣﯩﺮﯨﻨﺪﻩ ﻗﺎﺯﺍﻕ ء ﺗﯩﻠﯩﻨﯩﯔ ﻗﻮﻟﺪﺍﻧﯩﻠﻤﺎﯞﻯ ﻗﺎﺯﺍﻕ ﺟﻪﺭﯨﻨﺪﻩ";
 const kTeststr_kk_Cyrl = " а билердің өзіне рұқсат берілмеген егер халық талап етсе ғана хан келісім берген өздеріңіз білесіздер қр қыл мыс тық кодексінде жазаның";
 const kTeststr_kk_Latn = " bolsa da otanyna qaityp keledi al oralmandar basqa elderde diasporasy ote az bolghandyqtan bir birine komektesip bauyrmal bolady birde men poezben oralmandardyng qazaqstangha keluin kordim monghol qazaqtary poezdan tuse sala jerdi suip jylap keletin biraq";
 const kTeststr_kl_Latn = " at nittartakkalli uani toqqarsimasatta akornanni nittartakkanut allanut ingerlaqqittoqarsinnaavoq kanukoka tassaavoq kommuneqarfiit kattuffiat nuna tamakkerlugu kommunit nittartagaannut ingerlaqqiffiusinnaasoq kisitsiserpassuit nunatsinnut tunngasut";
 const kTeststr_km_Khmr = " ក ខ គ ឃ ង ច ឆ ជ ឈ ញ ដ ឋ ឌ ឍ ណ ត ថ ទ ធ ន ប ផ ព ភ ម យ រ ល វ ស ហ ឡ អ ឥ ឦ ឧ ឪ ឫ ឬ ឯ ឱ ទាំងអស់";
 const kTeststr_kn_Knda = " ಂಠಯ್ಯನವರು ತುಮಕೂರು ಜಿಲ್ಲೆಯ ಚಿಕ್ಕನಾಯಕನಹಳ್ಳಿ ತಾಲ್ಲೂಕಿನ ತೀರ್ಥಪುರ ವೆಂಬ ಸಾಧಾರಣ ಹಳ್ಳಿಯ ಶ್ಯಾನುಭೋಗರ";
 const kTeststr_ko_Hani = " 개별적으로 리포트 액세스 권한을 부여할 수 있습니다 액세스 권한 부여사용자에게 프로필 리포트에 액세스할 수 있는 권한을 부여하시려면 가용 프로필 상자에서 프로필 이름을 선택한 다음";
-//const kTeststr_ks_Arab = "پیٹھ سٮ۪اگت! آکھ آزاد گیانکوشٖٔ ہۄ کٲنٛسِہ تِہ ہٮ۪کُن اٮ۪ڑِٹ۔ تور چھک ٢٢٨ مَضموٗنن منز کٲشُر ویکیپیٖڈیا چھُ آکھ مَنصوٗبہٕ خٲطرٕ بنَاوُن آکھ گیانکوشٖٔ سۭتۍ آزاد منز 280 زَبانَن تٔمِس یۄسہٕ ژٕ سۭتۍ تُہُنٛد گیان ہُرٮ۪ر کَرُن ہٮ۪کُن";
 // From 10% testing part of new lang=ks scrape
 const kTeststr_ks_Arab = " ژماں سرابن منز  گرٲن چھِہ خابٕک کھلونہٕ ؤڈراواں   تُلتِھ نِیَس تہٕ گوشہِ گوشہِ مندچھاوى۪س   دِلس چھُہ وون٘ت وُچھان از ستم قلم  صبوٝرٕ وول مسٲفر لیۆکھُن بێتابن منز   ورل سوال چھُہ تراواں جوابن منز    کالہٕ پھۯستہٕ پھن٘ب پگَہہ پہ   پۆت نظر دِژ نہٕ ژھالہٕ مٔت آرن     مٲنز مسول متھان چھےٚ مس والن  وۅن چھےٚ غارن تہِ نارٕ ژھٹھ ژاپان  رێش تۅرگ تراوٕہن تہٕ ون رٹہٕ ہن  ہوشہِ ہێۆچھ نہٕ پوشنوٝلس نِش  مۅہرٕ دی دی زٕلاں چھِ زى۪و حرفن  لۆدرٕ پھٔل ہى۪تھ ملر عازمؔ  سۆدرٕ کھۅنہِ منز منگاں چھُہ ندرى۪ن پن   ژے تھى۪کی یہِ مسٲفر پنن وُڈو تہٕ پڑاو   گٕتَو گٕتَو چھےٚ یہِ کۅل بُتھ تہٕ بانہٕ سٕہہ گۅردٕ چھہِ سپداں دمہٕ پُھٹ  چھِٹہ پونپر پکھہٕ داران سُہ یتى۪ن تۯاوِ  کم نظر دۯاکھ تہٕ باسیوے سُہ مۆہ ہیو یێران  مےٚ ژى۪تُرمُت چھُہ سُلی تس چھےٚ کتى۪ن تھپھ  شاد مس کراں وُچھ مےٚ خون  ژٕ خبر کیازِ کراں دۯاکھ تمِس پى۪ٹھ ماتم  أز کہِ شبہٕ آو مےٚ بێیہِ پیش سفر زانہِ خدا  دارِ پى۪ٹھ ژٲنگ ہنا تھو زِ ژے چھےٚ مێون  أنہٕ کپٹاں چھُہ زٕژن سون مظفّر عازمؔ  پوشہ برگن چھُہ سُواں چاکھ سُہ الماس قلم   لوِ کٔ ڈ نوِ سرٕ سونتس کل   پروِ بۆر بێیہ از بانبرِ ہۆت  یمبرزلہِ ٹارى۪ن منز نار   وزملہِ کۅسہٕ کتھ کٔر اظہار  کچھہِ منزٕ ؤن رووُم اچھہِ  چشمو ژوپُم کٔنڈ انبار   تماشہِ چھہِ تگاں";
 
 const kTeststr_ks_Deva = "नमस्ते शारदे देवि काश्मिरपुर्वासिनि त्वामहम प्रार्थये देवि विद्य दानम च देहि मे कॉशुर लेख॒नुक सारिव॒य खॊत॒ आसान तरीक॒ छु यि देवनागरी टाइपराइटर इस्तिमाल करुन. अथ मंज़ छि कॉशुर लेख॒न॒चि सारॆय मात्रायि. अमि अलाव॒ हॆकिव तॊह्य् यिम॒ यूनिकोड एडिटर ति वरतॉविथ मगर कॉशिरि मात्रायि लेख॒नस गछ़ि हना दिकथ: अक्षरमालाछु अख मुफ़्त त॒ सॅहॅल सोफ्टवेर यॆमि स॒त्य् युनिकोड देवनागरी मंज़ ITRANS scheme स॒त्य् छु यिवान लेख॒न॒. वुछिव: सहायता. अथ स॒त्य् जुडिथ जालपृष्ठ (वेबपेज) (सॉरी अँग्रीज़ी पॉठ्य)";
 const kTeststr_ku_Arab = " بۆ به ڕێوه بردنی نامه ی که دێتن ڕاسته وخۆ ڕه وان بکه نامه کانی گ مایل بۆ حسابی پۆستێکی تر هێنانی په یوه ندکاره کان له";
 const kTeststr_ku_Latn = " be zmaneki ter le inglis werdegeretewe em srvise heshta le cor beta daye wate hest a taqi dekrete u bashtr dekret tewawwzmanekan wernegrawnetewe u ne hemu laperakn ke eme pshtiwan dekayn be teaweti wergerawete nermwalley wergeran teksti new wene nasnatewe";
 const kTeststr_ky_Arab = " جانا انى تانۇۇ ۇلۇتۇن تانۇۇ قىرعىزدى بئلۉۉ دەگەندىك اچىق ايتساق ماناستى تاانىعاندىق ۅزۉڭدۉ تاانىعاندىق بۉگۉن تەما جۉكتۅمۅ ق ى رع ى ز ت ى ل ى";
 const kTeststr_ky_Cyrl = " агай эле оболу мен садыбакас аганын өзү менен эмес эмгектери менен тааныштым жылдары ташкенде өзбекстан илимдер академиясынын баяны";
@@ -144,17 +137,16 @@ const kTeststr_lv_Latn = " a gadskārtējā izpārdošana slēpošana jāņi atlaide izmaiņas trafikā kas saistītas ar sezonas izpārdošanu speciālajām atlaidēm u c ir parastas un atslēgvārdi kas ir populāri noteiktos laika posmos šajā laikā saņems lielāku klikšķu";
 const kTeststr_mfe_Latn = "Anz dir mwa, Sa bann delo ki to trouve la, kot fam prostitie asize, samem bann pep, bann lafoul dimoun, bann nasion ek bann langaz. Sa dis korn ki to finn trouve, ansam avek bebet la, zot pou ena laenn pou prostitie la; zot pou pran tou seki li ena e met li touni, zot pou manz so laser e bril seki reste dan dife. Parski Bondie finn met dan zot leker proze pou realiz so plan. Zot pou met zot dakor pou sed zot pouvwar bebet la ziska ki parol Bondie fini realize.";
 const kTeststr_mg_Latn = " amporisihin i ianao mba hijery ny dika teksta ranofotsiny an ity lahatsoratra ity tsy ilaina ny opérateur efa karohina daholo ny teny rehetra nosoratanao ampiasao anaovana dokambarotra i google telugu datin ny takelaka fikarohana sary renitakelak i";
 const kTeststr_mi_Latn = " haere ki te kainga o o haere ki te kainga o o haere ki te kainga o te rapunga ahua o haere ki te kainga o ka tangohia he ki to rapunga kaore au mohio te tikanga whakatiki o te ra he whakaharuru te pai rapunga a te rapunga ahua a e kainga o nga awhina o te";
 const kTeststr_mk_Cyrl = " гласовите коалицијата на вмро дпмне како партија со најмногу освоени гласови ќе добие евра а на сметката на коализијата за македонија";
 const kTeststr_ml_Mlym = " ം അങ്ങനെ ഞങ്ങള് അവരുടെ മുമ്പില് നിന്നു ഔടും ഉടനെ നിങ്ങള് പതിയിരിപ്പില് നിന്നു എഴുന്നേറ്റു";
 const kTeststr_mn_Cyrl = " а боловсронгуй болгох орон нутгийн ажил үйлсийг уялдуулж зохицуулах дүрэм журам боловсруулах орон нутгийн өмч хөрөнгө санхүүгийн";
 const kTeststr_mn_Mong = "ᠦᠭᠡ ᠵᠢᠨ ᠴᠢᠨᠭ᠎ᠠ ᠬᠦᠨᠳᠡᠢ ᠵᠢ ᠢᠯᠭᠠᠬᠣ";
 const kTeststr_mr_Deva = "हैदराबाद  उच्चार ऐका (सहाय्य·माहिती)तेलुगू: హైదరాబాదు , उर्दू: حیدر آباد हे भारतातील आंध्र प्रदेश राज्याच्या राजधानीचे शहर आहे. हैदराबादची लोकसंख्या ७७ लाख ४० हजार ३३४ आहे. मोत्यांचे शहर अशी एकेकाळी ओळख असलेल्या या शहराला ऐतिहासिक, सांस्कृतिक आणि स्थापत्यशास्त्रीय वारसा लाभला आहे. १९९० नंतर शिक्षण आणि माहिती तंत्रज्ञान त्याचप्रमाणे औषधनिर्मिती आणि जैवतंत्रज्ञान क्षेत्रातील उद्योगधंद्यांची वाढ शहरात झाली. दक्षिण मध्य भारतातील पर्यटन आणि तेलुगू चित्रपटनिर्मितीचे हैदराबाद हे केंद्र आहे";
-//const kTeststr_ms_Latn = "daripada dirinya hirako shinji seorang pemuda merujuk diri mereka sebagai vizard shinji telah cuba untuk menyakinkan ichigo untuk menyertai kumpulan mereka mengatakan bahawa hanya dia sahaja yang mampu mengajar ichigo teknik untuk mengawal hollow";
 // From 10% testing part of new lang=ms scrape
 const kTeststr_ms_Latn = "pengampunan beramai-ramai supaya mereka pulang ke rumah masing-masing. Orang-orang besarnya enggan mengiktiraf sultan yang dilantik oleh Belanda sebagai Yang DiPertuan Selangor. Orang ramai pula tidak mahu menjalankan perniagaan bijih timah dengan Belanda, selagi raja yang berhak tidak ditabalkan. Perdagang yang lain dibekukan terus kerana untuk membalas jasa beliau yang membantu Belanda menentang Riau, Johor dan Selangor. Di antara tiga orang Sultan juga dipandang oleh rakyat sebagai seorang sultan yang paling gigih. 1 | 2 SULTAN Sebagai ganti Sultan Ibrahim ditabalkan Raja Muhammad iaitu Raja Muda. Walaupun baginda bukan anak isteri pertama bergelar Sultan Muhammad bersemayam di Kuala Selangor juga. Pentadbiran baginda yang lemah itu menyebabkan Kuala Selangor menjadi sarang ioleh Cina di Lukut tidak diambil tindakan, sedangkan baginda sendiri banyak berhutang kepada 1";
 
 const kTeststr_ms_Latn2 = "bilik sebelah berkata julai pada pm ladymariah hmm sume ni terpulang kepada individu mungkin anda bernasib baik selama ini dalam membeli hp yang bagus deli berkata julai pada pm walaupun bukan bahsa baku tp tetap bahasa melayu kan perubahan boleh dibuat";
 const kTeststr_mt_Latn = " ata ikteb messaġġ lil indirizzi differenti billi tagħżilhom u tagħfas il buttuna ikteb żid numri tfittxijja tal kotba mur print home kotba minn pagni ghal pagna minn ghall ktieb ta aċċessa stieden habib iehor grazzi it tim tal gruppi google";
 const kTeststr_my_Latn = " jyk ef oif gawgodcsifayvdrfhrnf bmawgrsm topf dsvj g mail tamumif avhvm atmif txjwgif yxrqhk avhvm efae m pwifavhvm ef ufkyfwdky help center odkyvmyg drsm ar avh dswjhar cgef rsm udkawdkifygw f tajzawgudk smedkifygw f jyd awmh g mail cool features rsm";
 const kTeststr_my_Mymr = " တက္ကသုိလ္ မ္ဟ ပ္ရန္ လာ္ရပီးေနာက္ န္ဟစ္ အရ္ဝယ္ ဦးသန္ ့သည္ ပန္ းတနော္ အမ္ယုိးသား ေက္ယာင္ း";
 const kTeststr_na_Latn = " arcol obabakaen riringa itorere ibibokiei ababaro min kuduwa airumena baoin tokin rowiowet itiket keram damadamit eigirow etoreiy row keitsito boney ibingo itsiw dorerin naoerodelaporte s nauruan dictionary a c a c d g h o p s t y aiquen ion eins aiquen";
@@ -189,17 +181,16 @@ const kTeststr_si_Sinh = " අනුරාධ මිහිඳුකුල නමින් සකුරා ට ලිපියක් තැපෑලෙන් එවා තිබුණා කි ් රස්ටි ෂෙල්ටන් ප ් රනාන්දු ද";
 const kTeststr_sit_NP = " dialekten in de roerstreek pierre bakkes oet roerstreek blz bewirk waordebook zónjig oktoeaber is t ieëste mofers waordebook oetgekaome dit waordebook is samegestèldj";
 const kTeststr_sk_Latn = " a aktivovať reklamnú kampaň ak chcete kampaň pred spustením ešte prispôsobiť uložte ju ako šablónu a pokračujte v úprave vyberte si jednu z možností nižšie a kliknite na tlačidlo uložiť kampaň nastavenia kampane môžete ľubovoľne";
 const kTeststr_sl_Latn = " adsense stanje prijave za google adsense google adsense račun je bil začasno zamrznjen pozdravljeni hvala za vaše zanimanje v google adsense po pregledu vaše prijavnice so naši strokovnjaki ugotovili da spletna stran ki je trenutno povezana z vašim";
 const kTeststr_sm_Latn = " autu mea o lo totonu le e le minaomia matou te tuu i totonu i le faamatalaina o le suesuega i taimi uma mea o lo totonu fuafua i mea e tatau fa afoi tala mai le newsgroup mataupu fa afoi mai tala e ai le mataupu e ai totonu tusitala o le itu o faamatalaga";
 const kTeststr_sn_Latn = " chete vanyori vanotevera vakabatsira kunyora zvikamu zvino kumba home tinyorere tsamba chikamu chakumbirwa hachina kuwanikwa chikamu ichi cheninge chakayiswa kuimwe nzvimbo mudhairekitori rino chimwe chikamu chopadhuze pane chinhu chatadza kushanda bad";
 const kTeststr_so_Latn = " a oo maanta bogga koobaad ugu qoran yahey beesha caalamka laakiin si kata oo beesha caalamku ula guntato soomaaliya waxa aan shaki ku jirin in aakhirataanka dadka soomaalida oo kaliya ay yihiin ku soomaaliya ka saari kara dhibka ay ku jirto";
 const kTeststr_sq_Latn = " a do të kërkoni nga beogradi që të njohë pavarësinë e kosovës zoti thaçi prishtina është gati ta njoh pavarësinë e serbisë ndërsa natyrisht se do të kërkohet një gjë e tillë që edhe beogradi ta njoh shtetin e pavarur dhe sovran të";
 const kTeststr_sr_Cyrl = "балчак балчак на мапи србије уреди демографија у насељу балчак живи пунолетна становника а просечна старост становништва износи година";
-//const kTeststr_sr_Latn = " autonomnih pokrajina saveznim zakonom može se propisati poseban sastav organizacija i delokrug saveta za poslove narodne odbrane članove saveta federacije bira na predlog predsedništva savezna skupština iz reda društveno političkih i drugih javnih";
 const kTeststr_sr_Latn = "Društvo | četvrtak 1.08.2013 | 13:43 Krade se i izvorska voda Izvor:  Gornji Milanovac -- U gružanskom selu Belo Polje prošle noći ukradeno je više od 10.000 litara kojima je obijen bazen. Bazen je bio zaključan i propisno obezbeđen.";
 
 const kTeststr_sr_ME_Latn = "savjet pobjeda a radi bržeg rada pošto rom radi sporije nego ram izvorni rom se isključuje a dio ram a se rezerviše te se u njega ne ploča procesor ram memorija grafička kartica zvučna kartica modem mrežna kartica napojna jedinica uređaji za pohranjivanje";
 const kTeststr_ss_Latn = " bakhokhintsela yesikhashana bafake imininingwane ye akhawunti leliciniso kulelifomu nangabe akukafakwa imininingwane leliciniso imali lekhokhiwe angeke ifakwe kumkhokhintsela lofanele imininingwane ye akhawunti ime ngalendlela lelandzelako inombolo";
 const kTeststr_st_Latn = " bang ba nang le thahasello matshwao a sehlooho thuto e thehilweng hodima diphetho ke tsela ya ho ruta le ho ithuta e totobatsang hantle seo baithuti ba lokelang ho se fihlella ntlhatheo eo e sebetsang ka yona ke ya hore titjhere o hlakisa pele seo";
 const kTeststr_su_Latn =  "Nu ngatur kahirupan warga, keur kapentingan pamarentahan diatur ku RT, RW jeung Kepala Dusun, sedengkeun urusan adat dipupuhuan ku Kuncen jeung kepala adat. Sanajan Kampung Kuta teu pati anggang jeung lembur sejenna nu aya di wewengkon Desa Pasir Angin, tapi boh wangunan imah atawa tradisi kahirupan masarakatna nenggang ti nu lian.";
 const kTeststr_sv_Latn = " a bort objekt från google desktop post äldst meny öretag dress etaljer alternativ för vad är inne yaste google skrivbord plugin program för nyheter google visa nyheter som är anpassade efter de artiklar som du läser om du till exempel läser";
 const kTeststr_sw_Latn = " a ujumbe mpya jumla unda tafuta na angalia vikundi vya kujadiliana na kushiriki mawazo iliyopangwa kwa tarehe watumiaji wapya futa orodha hizi lugha hoja vishikanisho vilivyo dhaminiwa ujumbe sanaa na tamasha toka udhibitisho wa neno kwa haraka fikia";
@@ -373,17 +364,16 @@ const kTestPairs = [
   ["id", "INDONESIAN", kTeststr_id_close, [true, 80], []],
   ["ms", "MALAY", kTeststr_ms_close],
 
 // Simple intermixed French/English text
   ["fr", "FRENCH", kTeststr_fr_en_Latn, [false, 80, "en", 32]],
 
 // Cross-check the main quadgram table build date
 // Change the expected language each time it is rebuilt
-  //["WELSH", kTeststr_version],   // 2013.07.15
   ["az", "AZERBAIJANI", kTeststr_version]   // 2014.01.31
 ];
 
 Components.utils.import("resource://gre/modules/Timer.jsm");
 let detectorModule = Components.utils.import("resource:///modules/translation/LanguageDetector.jsm");
 
 function check_result(result, langCode, expected) {
   equal(result.language, langCode, "Expected language code");
--- a/browser/components/uitour/test/browser_UITour_modalDialog.js
+++ b/browser/components/uitour/test/browser_UITour_modalDialog.js
@@ -40,17 +40,17 @@ var observer = SpecialPowers.wrapCallbac
     }
 });
 
 function getDialogDoc() {
   // Find the <browser> which contains notifyWindow, by looking
   // through all the open windows and all the <browsers> in each.
   var wm = Cc["@mozilla.org/appshell/window-mediator;1"].
            getService(Ci.nsIWindowMediator);
-  //var enumerator = wm.getEnumerator("navigator:browser");
+  // var enumerator = wm.getEnumerator("navigator:browser");
   var enumerator = wm.getXULWindowEnumerator(null);
 
   while (enumerator.hasMoreElements()) {
     var win = enumerator.getNext();
     var windowDocShell = win.QueryInterface(Ci.nsIXULWindow).docShell;
 
     var containedDocShells = windowDocShell.getDocShellEnumerator(
                                       Ci.nsIDocShellTreeItem.typeChrome,
@@ -60,17 +60,17 @@ function getDialogDoc() {
         var childDocShell = containedDocShells.getNext();
         // We don't want it if it's not done loading.
         if (childDocShell.busyFlags != Ci.nsIDocShell.BUSY_FLAGS_NONE)
           continue;
         var childDoc = childDocShell.QueryInterface(Ci.nsIDocShell)
                                     .contentViewer
                                     .DOMDocument;
 
-        //ok(true, "Got window: " + childDoc.location.href);
+        // ok(true, "Got window: " + childDoc.location.href);
         if (childDoc.location.href == "chrome://global/content/commonDialog.xul")
           return childDoc;
     }
   }
 
   return null;
 }
 
--- a/browser/experiments/Experiments.jsm
+++ b/browser/experiments/Experiments.jsm
@@ -482,17 +482,17 @@ Experiments.Experiments.prototype = {
       isFirstEvaluate: this._firstEvaluate,
       hasLoadTask: !!this._loadTask,
       hasMainTask: !!this._mainTask,
       hasTimer: !!this._hasTimer,
       hasAddonProvider: !!gAddonProvider,
       latestLogs: this._forensicsLogs,
       experiments: this._experiments ? [...this._experiments.keys()] : null,
       terminateReason: this._terminateReason,
-      activeExperiment: !!activeExperiment ? activeExperiment.id : null,
+      activeExperiment: activeExperiment ? activeExperiment.id : null,
     };
     if (this._latestError) {
       if (typeof this._latestError == "object") {
         state.latestError = {
           message: this._latestError.message,
           stack: this._latestError.stack
         };
       } else {
@@ -1559,17 +1559,17 @@ Experiments.ExperimentEntry.prototype = 
         let date = new Date();
         date.setTime(data[key]);
         this[key] = date;
       }
     });
 
     // In order for the experiment's data expiration mechanism to work, use the experiment's
     // |_endData| as the |_lastChangedDate| (if available).
-    this._lastChangedDate = !!this._endDate ? this._endDate : this._policy.now();
+    this._lastChangedDate = this._endDate ? this._endDate : this._policy.now();
 
     return true;
   },
 
   /*
    * Returns a JSON representation of this object.
    */
   toJSON: function () {
@@ -1971,17 +1971,17 @@ Experiments.ExperimentEntry.prototype = 
     }
 
     // Check permissions to see if we can enable the addon.
     if (!(addon.permissions & AddonManager.PERM_CAN_ENABLE)) {
       throw new Error("Don't have permission to enable addon " + addon.id + ", perm=" + addon.permission);
     }
 
     // Experiment addons should not require a restart.
-    if (!!(addon.operationsRequiringRestart & AddonManager.OP_NEEDS_RESTART_ENABLE)) {
+    if (addon.operationsRequiringRestart & AddonManager.OP_NEEDS_RESTART_ENABLE) {
       throw new Error("Experiment addon requires a restart: " + addon.id);
     }
 
     let deferred = Promise.defer();
 
     // Else we need to enable it.
     let listener = {
       onEnabled: enabledAddon => {
--- a/browser/modules/ContentWebRTC.jsm
+++ b/browser/modules/ContentWebRTC.jsm
@@ -71,17 +71,17 @@ this.ContentWebRTC = {
         let callID = aMessage.data.callID;
         let contentWindow = Services.wm.getOuterWindowWithId(aMessage.data.windowID);
         let devices = contentWindow.pendingGetUserMediaRequests.get(callID);
         forgetGUMRequest(contentWindow, callID);
 
         let allowedDevices = Cc["@mozilla.org/array;1"]
                                .createInstance(Ci.nsIMutableArray);
         for (let deviceIndex of aMessage.data.devices)
-           allowedDevices.appendElement(devices[deviceIndex], /*weak =*/ false);
+           allowedDevices.appendElement(devices[deviceIndex], /* weak =*/ false);
 
         Services.obs.notifyObservers(allowedDevices, "getUserMedia:response:allow", callID);
         break;
       }
       case "webrtc:Deny":
         denyGUMRequest(aMessage.data);
         break;
       case "webrtc:StopSharing":
--- a/browser/modules/PluginContent.jsm
+++ b/browser/modules/PluginContent.jsm
@@ -337,17 +337,17 @@ PluginContent.prototype = {
       if (el !== plugin) {
         return false;
       }
     }
 
     return true;
   },
 
-  addLinkClickCallback: function (linkNode, callbackName /*callbackArgs...*/) {
+  addLinkClickCallback: function (linkNode, callbackName /* callbackArgs...*/) {
     // XXX just doing (callback)(arg) was giving a same-origin error. bug?
     let self = this;
     let callbackArgs = Array.prototype.slice.call(arguments).slice(2);
     linkNode.addEventListener("click",
                               function(evt) {
                                 if (!evt.isTrusted)
                                   return;
                                 evt.preventDefault();
--- a/browser/modules/WindowsJumpLists.jsm
+++ b/browser/modules/WindowsJumpLists.jsm
@@ -80,17 +80,17 @@ XPCOMUtils.defineLazyModuleGetter(this, 
 /**
  * Global functions
  */
 
 function _getString(name) {
   return _stringBundle.GetStringFromName(name);
 }
 
-/////////////////////////////////////////////////////////////////////////////
+// ///////////////////////////////////////////////////////////////////////////
 // Task list configuration data object.
 
 var tasksCfg = [
   /**
    * Task configuration options: title, description, args, iconIndex, open, close.
    *
    * title       - Task title displayed in the list. (strings in the table are temp fillers.)
    * description - Tooltip description on the list item.
@@ -130,17 +130,17 @@ var tasksCfg = [
     args:             "-private-window",
     iconIndex:        4, // Private browsing mode icon
     open:             true,
     close:            true, // No point, but we don't always update the list on
                             // shutdown. Thus true for consistency.
   },
 ];
 
-/////////////////////////////////////////////////////////////////////////////
+// ///////////////////////////////////////////////////////////////////////////
 // Implementation
 
 this.WinTaskbarJumpList =
 {
   _builder: null,
   _tasks: null,
   _shuttingDown: false,
 
--- a/browser/modules/WindowsPreviewPerTab.jsm
+++ b/browser/modules/WindowsPreviewPerTab.jsm
@@ -57,18 +57,18 @@ Cu.import("resource://gre/modules/XPCOMU
 const TOGGLE_PREF_NAME = "browser.taskbar.previews.enable";
 // Pref to determine the magic auto-disable threshold
 const DISABLE_THRESHOLD_PREF_NAME = "browser.taskbar.previews.max";
 // Pref to control the time in seconds that tab contents live in the cache
 const CACHE_EXPIRATION_TIME_PREF_NAME = "browser.taskbar.previews.cachetime";
 
 const WINTASKBAR_CONTRACTID = "@mozilla.org/windows-taskbar;1";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Various utility properties
+// //////////////////////////////////////////////////////////////////////////////
+// // Various utility properties
 XPCOMUtils.defineLazyServiceGetter(this, "imgTools",
                                    "@mozilla.org/image/tools;1",
                                    "imgITools");
 XPCOMUtils.defineLazyModuleGetter(this, "PageThumbs",
                                   "resource://gre/modules/PageThumbs.jsm");
 
 // nsIURI -> imgIContainer
 function _imageFromURI(uri, privateMode, callback) {
@@ -118,18 +118,18 @@ function snapRectAtScale(r, scale) {
   let height = Math.ceil((r.y + r.height) * scale) - y;
 
   r.x = x / scale;
   r.y = y / scale;
   r.width = width / scale;
   r.height = height / scale;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// PreviewController
+// //////////////////////////////////////////////////////////////////////////////
+// // PreviewController
 
 /*
  * This class manages the behavior of thumbnails and previews. It has the following
  * responsibilities:
  * 1) responding to requests from Windows taskbar for a thumbnail or window
  *    preview.
  * 2) listens for dom events that result in a thumbnail or window preview needing
  *    to be refresh, and communicates this to the taskbar.
@@ -234,18 +234,18 @@ PreviewController.prototype = {
   },
 
   updateTitleAndTooltip: function () {
     let title = this.win.tabbrowser.getWindowTitleForBrowser(this.linkedBrowser);
     this.preview.title = title;
     this.preview.tooltip = title;
   },
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsITaskbarPreviewController
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsITaskbarPreviewController
 
   // window width and height, not browser
   get width() {
     return this.win.width;
   },
 
   // window width and height, not browser
   get height() {
@@ -317,32 +317,32 @@ PreviewController.prototype = {
    */
   requestThumbnail: function (aTaskbarCallback, aRequestedWidth, aRequestedHeight) {
     this.resizeCanvasPreview(aRequestedWidth, aRequestedHeight);
     this.updateCanvasPreview(false, (aThumbnailCanvas) => {
       aTaskbarCallback.done(aThumbnailCanvas, false);
     });
   },
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// Event handling
+  // ////////////////////////////////////////////////////////////////////////////
+  // // Event handling
 
   onClose: function () {
     this.win.tabbrowser.removeTab(this.tab);
   },
 
   onActivate: function () {
     this.win.tabbrowser.selectedTab = this.tab;
 
     // Accept activation - this will restore the browser window
     // if it's minimized
     return true;
   },
 
-  //// nsIDOMEventListener
+  // // nsIDOMEventListener
   handleEvent: function (evt) {
     switch (evt.type) {
       case "TabAttrModified":
         this.updateTitleAndTooltip();
         break;
     }
   }
 };
@@ -350,18 +350,18 @@ PreviewController.prototype = {
 XPCOMUtils.defineLazyGetter(PreviewController.prototype, "canvasPreviewFlags",
   function () { let canvasInterface = Ci.nsIDOMCanvasRenderingContext2D;
                 return canvasInterface.DRAWWINDOW_DRAW_VIEW
                      | canvasInterface.DRAWWINDOW_DRAW_CARET
                      | canvasInterface.DRAWWINDOW_ASYNC_DECODE_IMAGES
                      | canvasInterface.DRAWWINDOW_DO_NOT_FLUSH;
 });
 
-////////////////////////////////////////////////////////////////////////////////
-//// TabWindow
+// //////////////////////////////////////////////////////////////////////////////
+// // TabWindow
 
 /*
  * This class monitors a browser window for changes to its tabs
  *
  * @param win
  *        The nsIDOMWindow browser window
  */
 function TabWindow(win) {
@@ -504,17 +504,17 @@ TabWindow.prototype = {
     // on it the sorting order of our local array.  To do so we must walk
     // the local array backwards, otherwise we would send move requests in the
     // wrong order.  See bug 522610 for details.
     for (let i = inorder.length - 1; i >= 0; i--) {
       inorder[i].move(inorder[i + 1] || null);
     }
   },
 
-  //// nsIDOMEventListener
+  // // nsIDOMEventListener
   handleEvent: function (evt) {
     let tab = evt.originalTarget;
     switch (evt.type) {
       case "TabOpen":
         this.newTab(tab);
         this.updateTabOrdering();
         break;
       case "TabClose":
@@ -578,22 +578,22 @@ TabWindow.prototype = {
     for (let [tab, preview] of this.previews) {
       if (aBrowser == tab.linkedBrowser) {
         preview.invalidate();
         break;
       }
     }
   },
 
-  //// Browser progress listener
+  // // Browser progress listener
 
   onLocationChange: function (aBrowser) {
     // I'm not sure we need this, onStateChange does a really good job
     // of picking up page changes.
-    //this.invalidateTabPreview(aBrowser);
+    // this.invalidateTabPreview(aBrowser);
   },
 
   onStateChange: function (aBrowser, aWebProgress, aRequest, aStateFlags, aStatus) {
     if (aStateFlags & Ci.nsIWebProgressListener.STATE_STOP &&
         aStateFlags & Ci.nsIWebProgressListener.STATE_IS_NETWORK) {
       this.invalidateTabPreview(aBrowser);
     }
   },
@@ -632,18 +632,18 @@ TabWindow.prototype = {
             preview.icon = img;
           }
         }
       }
     );
   }
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// AeroPeek
+// //////////////////////////////////////////////////////////////////////////////
+// // AeroPeek
 
 /*
  * This object acts as global storage and external interface for this feature.
  * It maintains the values of the prefs.
  */
 this.AeroPeek = {
   available: false,
   // Does the pref say we're enabled?
@@ -796,17 +796,17 @@ this.AeroPeek = {
       this.destroy();
   },
 
   resetCacheTimer: function () {
     this.cacheTimer.cancel();
     this.cacheTimer.init(this, 1000*this.cacheLifespan, Ci.nsITimer.TYPE_ONE_SHOT);
   },
 
-  //// nsIObserver
+  // // nsIObserver
   observe: function (aSubject, aTopic, aData) {
     if (aTopic == "nsPref:changed" && aData == TOGGLE_PREF_NAME) {
       this._prefenabled = this.prefs.getBoolPref(TOGGLE_PREF_NAME);
     }
     if (!this._prefenabled) {
       return;
     }
     switch (aTopic) {
--- a/browser/modules/test/browser_UsageTelemetry.js
+++ b/browser/modules/test/browser_UsageTelemetry.js
@@ -157,17 +157,17 @@ add_task(function* test_subsessionSplit(
                 totalURIs: 1, domainCount: 1, totalUnfilteredURIs: 2});
 
   // Remove a tab.
   yield BrowserTestUtils.removeTab(openedTabs.pop());
 
   // Simulate a subsession split by clearing the scalars (via |snapshotScalars|) and
   // notifying the subsession split topic.
   Services.telemetry.snapshotScalars(Ci.nsITelemetry.DATASET_RELEASE_CHANNEL_OPTIN,
-                                     true /* clearScalars*/);
+                                     true /* clearScalars */);
   Services.obs.notifyObservers(null, TELEMETRY_SUBSESSION_TOPIC, "");
 
   // After a subsession split, only the MAX_CONCURRENT_* scalars must be available
   // and have the correct value. No tabs, windows or URIs were opened so other scalars
   // must not be reported.
   checkScalars({maxTabs: 4, tabOpenCount: 0, maxWindows: 2, windowsOpenCount: 0,
                 totalURIs: 0, domainCount: 0, totalUnfilteredURIs: 0});
 
--- a/browser/modules/test/browser_UsageTelemetry_searchbar.js
+++ b/browser/modules/test/browser_UsageTelemetry_searchbar.js
@@ -4,17 +4,16 @@ const SCALAR_SEARCHBAR = "browser.engage
 
 let searchInSearchbar = Task.async(function* (inputText) {
   let win = window;
   yield new Promise(r => waitForFocus(r, win));
   let sb = BrowserSearch.searchBar;
   // Write the search query in the searchbar.
   sb.focus();
   sb.value = inputText;
-  //sb.textbox.openPopup();
   sb.textbox.controller.startSearch(inputText);
   // Wait for the popup to show.
   yield BrowserTestUtils.waitForEvent(sb.textbox.popup, "popupshown");
   // And then for the search to complete.
   yield BrowserTestUtils.waitForCondition(() => sb.textbox.controller.searchStatus >=
                                                 Ci.nsIAutoCompleteController.STATUS_COMPLETE_NO_MATCH,
                                           "The search in the searchbar must complete.");
 });
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/Screenshot.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/Screenshot.jsm
@@ -68,17 +68,17 @@ this.Screenshot = {
   // Capture the whole screen using an external application.
   captureExternal(filename) {
     let imagePath = this._buildImagePath(filename);
     return this._screenshotFunction(imagePath).then(() => {
       log.debug("saved screenshot: " + filename);
     });
   },
 
-  ///// helpers /////
+  // /// helpers /////
 
   _screenshotWindows(filename) {
     return new Promise((resolve, reject) => {
       let exe = Services.dirsvc.get("GreBinD", Ci.nsIFile);
       exe.append("screenshot.exe");
       if (!exe.exists()) {
         exe = Services.dirsvc.get("CurWorkD", Ci.nsIFile).parent;
         exe.append("bin");
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm
@@ -143,17 +143,17 @@ this.TestRunner = {
     while (gBrowser.tabs.length > 1) {
       gBrowser.removeTab(gBrowser.selectedTab, {animate: false});
     }
     gBrowser.unpinTab(gBrowser.selectedTab);
     gBrowser.selectedBrowser.loadURI("data:text/html;charset=utf-8,<h1>Done!");
     browserWindow.restore();
   },
 
-  ///// helpers /////
+  // /// helpers /////
 
   _performCombo: function*(combo) {
     let paddedComboIndex = padLeft(this.currentComboIndex + 1, String(this.combos.length).length);
     log.info("Combination " + paddedComboIndex + "/" + this.combos.length + ": " +
              this._comboName(combo).substring(1));
 
     function changeConfig(config) {
       log.debug("calling " + config.name);
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Toolbars.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Toolbars.jsm
@@ -40,18 +40,18 @@ this.Toolbars = {
         return undefined;
       }),
     },
 
   },
 };
 
 
-///// helpers /////
+// /// helpers /////
 
 function toggleMenubarIfNecessary(visible) {
   let browserWindow = Services.wm.getMostRecentWindow("navigator:browser");
   // The menubar is not shown on OS X or while in fullScreen
-  if (Services.appinfo.OS != "Darwin" /*&& !browserWindow.fullScreen*/) {
+  if (Services.appinfo.OS != "Darwin" /* && !browserWindow.fullScreen*/) {
     let menubar = browserWindow.document.getElementById("toolbar-menubar");
     browserWindow.setToolbarVisibility(menubar, visible);
   }
 }
--- a/storage/test/unit/head_storage.js
+++ b/storage/test/unit/head_storage.js
@@ -262,18 +262,18 @@ function getTableRowCount(aTableName)
     currentRows = countStmt.row.count;
   }
   finally {
     countStmt.finalize();
   }
   return currentRows;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Promise-Returning Functions
+// //////////////////////////////////////////////////////////////////////////////
+// // Promise-Returning Functions
 
 function asyncClone(db, readOnly) {
   let deferred = Promise.defer();
   db.asyncClone(readOnly, function (status, db2) {
     if (Components.isSuccessCode(status)) {
       deferred.resolve(db2);
     } else {
       deferred.reject(status);
--- a/storage/test/unit/test_js_helpers.js
+++ b/storage/test/unit/test_js_helpers.js
@@ -4,18 +4,18 @@
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 /**
  * This file tests that the JS language helpers in various ways.
  */
 
-////////////////////////////////////////////////////////////////////////////////
-//// Test Functions
+// //////////////////////////////////////////////////////////////////////////////
+// // Test Functions
 
 function test_params_enumerate()
 {
   let stmt = createStatement(
     "SELECT * FROM test WHERE id IN (:a, :b, :c)"
   );
 
   // Make sure they are right.
@@ -96,18 +96,18 @@ function test_params_gets_async()
   }
 
   // Now make sure we didn't magically get any additional properties.
   let finalCount = Object.getOwnPropertyNames(stmt.params).length;
   do_check_eq(originalCount + expected.length, finalCount);
   */
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Test Runner
+// //////////////////////////////////////////////////////////////////////////////
+// // Test Runner
 
 var tests = [
   test_params_enumerate,
   test_params_prototype,
   test_row_prototype,
   test_params_gets_sync,
   test_params_gets_async,
 ];
--- a/storage/test/unit/test_locale_collation.js
+++ b/storage/test/unit/test_locale_collation.js
@@ -19,18 +19,18 @@ const DATA_BASENAME = "locale_collation.
 var gStrings;
 
 // A collation created from the application's locale.  Used by localeCompare().
 var gLocaleCollation;
 
 // A connection to our in-memory UTF-16-encoded database.
 var gUtf16Conn;
 
-///////////////////////////////////////////////////////////////////////////////
-//// Helper Functions
+// /////////////////////////////////////////////////////////////////////////////
+// // Helper Functions
 
 /**
  * Since we create a UTF-16 database we have to clean it up, in addition to
  * the normal cleanup of Storage tests.
  */
 function cleanupLocaleTests()
 {
   print("-- Cleaning up test_locale_collation.js suite.");
@@ -246,18 +246,18 @@ function setup()
 
   let localeSvc = Cc["@mozilla.org/intl/nslocaleservice;1"].
                   getService(Ci.nsILocaleService);
   let collFact = Cc["@mozilla.org/intl/collation-factory;1"].
                  createInstance(Ci.nsICollationFactory);
   gLocaleCollation = collFact.CreateCollation(localeSvc.getApplicationLocale());
 }
 
-///////////////////////////////////////////////////////////////////////////////
-//// Test Runs
+// /////////////////////////////////////////////////////////////////////////////
+// // Test Runs
 
 var gTests = [
   {
     desc: "Case and accent sensitive UTF-8",
     run:   () => runUtf8Test("locale_case_accent_sensitive")
   },
 
   {
--- a/storage/test/unit/test_sqlite_secure_delete.js
+++ b/storage/test/unit/test_sqlite_secure_delete.js
@@ -1,21 +1,21 @@
-/*-*- indent-tabs-mode: nil; js-indent-level: 2 -*-
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
  *vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
  * This file tests to make sure that SQLite was compiled with
  * SQLITE_SECURE_DELETE=1.
  */
 
-////////////////////////////////////////////////////////////////////////////////
-//// Helper Methods
+// //////////////////////////////////////////////////////////////////////////////
+// // Helper Methods
 
 /**
  * Reads the contents of a file and returns it as a string.
  *
  * @param aFile
  *        The file to return from.
  * @return the contents of the file in the form of a string.
  */
@@ -26,18 +26,18 @@ function getFileContents(aFile)
   fstream.init(aFile, -1, 0, 0);
 
   let bstream = Cc["@mozilla.org/binaryinputstream;1"].
                 createInstance(Ci.nsIBinaryInputStream);
   bstream.setInputStream(fstream);
   return bstream.readBytes(bstream.available());
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Tests
+// //////////////////////////////////////////////////////////////////////////////
+// // Tests
 
 add_test(function test_delete_removes_data() {
   const TEST_STRING = "SomeRandomStringToFind";
 
   let file = getTestDB();
   let db = getService().openDatabase(file);
 
   // Create the table and insert the data.
--- a/storage/test/unit/test_statement_executeAsync.js
+++ b/storage/test/unit/test_statement_executeAsync.js
@@ -869,18 +869,18 @@ function test_multiple_results()
   // Now check that we get back two rows of data from our async query.
   let stmt = makeTestStatement("SELECT * FROM test");
   execAsync(stmt, {}, expectedResults);
 
   stmt.finalize();
   run_next_test();
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Test Runner
+// //////////////////////////////////////////////////////////////////////////////
+// // Test Runner
 
 
 const TEST_PASS_SYNC = 0;
 const TEST_PASS_ASYNC = 1;
 /**
  * We run 2 passes against the test.  One where makeTestStatement generates
  * synchronous (mozIStorageStatement) statements and one where it generates
  * asynchronous (mozIStorageAsyncStatement) statements.
--- a/storage/test/unit/test_storage_connection.js
+++ b/storage/test/unit/test_storage_connection.js
@@ -1,16 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // This file tests the functions of mozIStorageConnection
 
-////////////////////////////////////////////////////////////////////////////////
-//// Test Functions
+// //////////////////////////////////////////////////////////////////////////////
+// // Test Functions
 
 add_task(function* test_connectionReady_open() {
   // there doesn't seem to be a way for the connection to not be ready (unless
   // we close it with mozIStorageConnection::Close(), but we don't for this).
   // It can only fail if GetPath fails on the database file, or if we run out
   // of memory trying to use an in-memory database
 
   var msc = getOpenedDatabase();
--- a/toolkit/.eslintrc.js
+++ b/toolkit/.eslintrc.js
@@ -80,17 +80,17 @@ module.exports = {
 
     // Disallow empty destructuring
     "no-empty-pattern": 2,
 
     // No assiging to exception variable
     "no-ex-assign": 2,
 
     // No using !! where casting to boolean is already happening
-    // "no-extra-boolean-cast": 2,
+    "no-extra-boolean-cast": 2,
 
     // No double semicolon
     "no-extra-semi": 2,
 
     // No overwriting defined functions
     "no-func-assign": 2,
 
     // No invalid regular expresions
@@ -113,17 +113,17 @@ module.exports = {
 
     // No (!foo in bar)
     "no-negated-in-lhs": 2,
 
     // Nested ternary statements are confusing
     "no-nested-ternary": 2,
 
     // Use {} instead of new Object()
-    // "no-new-object": 2,
+    "no-new-object": 2,
 
     // No Math() or JSON()
     "no-obj-calls": 2,
 
     // No octal literals
     "no-octal": 2,
 
     // No redeclaring variables
@@ -131,17 +131,17 @@ module.exports = {
 
     // No unnecessary comparisons
     "no-self-compare": 2,
 
     // No declaring variables from an outer scope
     // "no-shadow": 2,
 
     // No declaring variables that hide things like arguments
-    // "no-shadow-restricted-names": 2,
+    "no-shadow-restricted-names": 2,
 
     // No spaces between function name and parentheses
     // "no-spaced-func": 2,
 
     // No trailing whitespace
     "no-trailing-spaces": 2,
 
     // No using undeclared variables
@@ -178,16 +178,19 @@ module.exports = {
     // "space-in-parens": [2, "never"],
 
     // Require spaces around operators
     // "space-infix-ops": 2,
 
     // ++ and -- should not need spacing
     // "space-unary-ops": [2, { "words": true, "nonwords": false }],
 
+    // Requires or disallows a whitespace (space or tab) beginning a comment
+    "spaced-comment": 2,
+
     // No comparisons to NaN
     "use-isnan": 2,
 
     // Only check typeof against valid results
     "valid-typeof": 2,
   },
   "env": {
     "es6": true,
--- a/toolkit/components/aboutmemory/content/aboutMemory.js
+++ b/toolkit/components/aboutmemory/content/aboutMemory.js
@@ -11,17 +11,17 @@
 //
 // "file=" is not case-sensitive.  We'll URI-unescape the contents of the
 // "file=" argument, and obviously the filename is case-sensitive iff you're on
 // a case-sensitive filesystem.  If you specify more than one "file=" argument,
 // only the first one is used.
 
 "use strict";
 
-//---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
 var CC = Components.Constructor;
 
 const KIND_NONHEAP           = Ci.nsIMemoryReporter.KIND_NONHEAP;
 const KIND_HEAP              = Ci.nsIMemoryReporter.KIND_HEAP;
@@ -56,17 +56,17 @@ var gMgr = Cc["@mozilla.org/memory-repor
 
 const gPageName = 'about:memory';
 document.title = gPageName;
 
 const gUnnamedProcessStr = "Main Process";
 
 var gIsDiff = false;
 
-//---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 // Forward slashes in URLs in paths are represented with backslashes to avoid
 // being mistaken for path separators.  Paths/names where this hasn't been
 // undone are prefixed with "unsafe"; the rest are prefixed with "safe".
 function flipBackslashes(aUnsafeStr)
 {
   // Save memory by only doing the replacement if it's necessary.
   return (aUnsafeStr.indexOf('\\') === -1)
@@ -115,23 +115,23 @@ function reportAssertionFailure(aMsg)
 }
 
 function debug(x)
 {
   let section = appendElement(document.body, 'div', 'section');
   appendElementWithText(section, "div", "debug", JSON.stringify(x));
 }
 
-//---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 function onUnload()
 {
 }
 
-//---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 // The <div> holding everything but the header and footer (if they're present).
 // It's what is updated each time the page changes.
 var gMain;
 
 // The <div> holding the footer.
 var gFooter;
 
@@ -208,17 +208,17 @@ function appendElementWithText(aP, aTagN
   let e = appendElement(aP, aTagName, aClassName);
   // Setting textContent clobbers existing children, but there are none.  More
   // importantly, it avoids creating a JS-land object for the node, saving
   // memory.
   e.textContent = aText;
   return e;
 }
 
-//---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 const explicitTreeDescription =
 "This tree covers explicit memory allocations by the application.  It includes \
 \n\n\
 * allocations made at the operating system level (via calls to functions such as \
 VirtualAlloc, vm_allocate, and mmap), \
 \n\n\
 * allocations made at the heap allocation level (via functions such as malloc, \
@@ -229,17 +229,17 @@ explicitly decommitted (i.e. evicted fro
 \n\n\
 It excludes memory that is mapped implicitly such as code and data segments, \
 and thread stacks. \
 \n\n\
 'explicit' is not guaranteed to cover every explicit allocation, but it does cover \
 most (including the entire heap), and therefore it is the single best number to \
 focus on when trying to reduce memory usage.";
 
-//---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 function appendButton(aP, aTitle, aOnClick, aText, aId)
 {
   let b = appendElementWithText(aP, "button", "", aText);
   b.title = aTitle;
   b.onclick = aOnClick;
   if (aId) {
     b.id = aId;
@@ -416,17 +416,17 @@ function onLoad()
         let filename = searchSplit[i].substring('file='.length);
         updateAboutMemoryFromFile(decodeURIComponent(filename));
         return;
       }
     }
   }
 }
 
-//---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 function doGC()
 {
   Services.obs.notifyObservers(null, "child-gc-request", null);
   Cu.forceGC();
   updateMainAndFooter("Garbage collection completed", HIDE_FOOTER);
 }
 
@@ -722,17 +722,17 @@ function updateAboutMemoryFromTwoFiles(a
         gIsDiff = false;
       } catch (ex) {
         handleException(ex);
       }
     });
   });
 }
 
-//---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 // Something unlikely to appear in a process name.
 var kProcessPathSep = "^:^:^";
 
 // Short for "diff report".
 function DReport(aKind, aUnits, aAmount, aDescription, aNMerged, aPresence)
 {
   this._kind = aKind;
@@ -939,17 +939,17 @@ function diffJSONObjects(aJson1, aJson2)
 
     hasMozMallocUsableSize: simpleProp("hasMozMallocUsableSize"),
 
     reports: makeJSONReports(diffDReportMaps(makeDReportMap(aJson1.reports),
                                              makeDReportMap(aJson2.reports)))
   };
 }
 
-//---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 // |PColl| is short for "process collection".
 function PColl()
 {
   this._trees = {};
   this._degenerates = {};
   this._heapTotal = 0;
 }
@@ -1090,17 +1090,17 @@ function appendAboutMemoryMain(aProcessR
                                        pcollsByProcess[process]._heapTotal,
                                        aHasMozMallocUsableSize);
     }
   }
 
   aProcessReports(handleReport, displayReports);
 }
 
-//---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 // There are two kinds of TreeNode.
 // - Leaf TreeNodes correspond to reports.
 // - Non-leaf TreeNodes are just scaffolding nodes for the tree;  their values
 //   are derived from their children.
 // Some trees are "degenerate", i.e. they contain a single node, i.e. they
 // correspond to a report whose path has no '/' separators.
 function TreeNode(aUnsafeName, aUnits, aIsDegenerate)
@@ -1984,25 +1984,25 @@ function appendTreeElements(aP, aRoot, a
     }
   }
 
   let rootStringLength = aRoot.toString().length;
   appendTreeElements2(aP, aProcess, [aRoot._unsafeName], aRoot, aRoot,
                       aPadText, "", "", rootStringLength);
 }
 
-//---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 function appendSectionHeader(aP, aText)
 {
   appendElementWithText(aP, "h2", "", aText + "\n");
   return appendElement(aP, "pre", "entries");
 }
 
-//---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 function saveReportsToFile()
 {
   let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
   fp.appendFilter("Zipped JSON files", "*.json.gz");
   fp.appendFilters(Ci.nsIFilePicker.filterAll);
   fp.filterIndex = 0;
   fp.addToRecentDocs = true;
--- a/toolkit/components/addoncompat/CompatWarning.jsm
+++ b/toolkit/components/addoncompat/CompatWarning.jsm
@@ -61,23 +61,23 @@ var CompatWarning = {
         return;
       }
 
       let message = `Warning: ${msg}`;
       if (warning)
         message += `\nMore info at: ${warning.url}`;
 
       error.init(
-                 /*message*/ message,
-                 /*sourceName*/ stack ? stack.filename : "",
-                 /*sourceLine*/ stack ? stack.sourceLine : "",
-                 /*lineNumber*/ stack ? stack.lineNumber : 0,
-                 /*columnNumber*/ 0,
-                 /*flags*/ Ci.nsIScriptError.warningFlag,
-                 /*category*/ "chrome javascript");
+                 /* message*/ message,
+                 /* sourceName*/ stack ? stack.filename : "",
+                 /* sourceLine*/ stack ? stack.sourceLine : "",
+                 /* lineNumber*/ stack ? stack.lineNumber : 0,
+                 /* columnNumber*/ 0,
+                 /* flags*/ Ci.nsIScriptError.warningFlag,
+                 /* category*/ "chrome javascript");
       Services.console.logMessage(error);
 
       if (Preferences.get("dom.ipc.shims.dumpWarnings", false)) {
         dump(message + "\n");
         while (stack) {
           dump(stack + "\n");
           stack = stack.caller;
         }
--- a/toolkit/components/addoncompat/Prefetcher.jsm
+++ b/toolkit/components/addoncompat/Prefetcher.jsm
@@ -96,28 +96,28 @@ function objAddr(obj)
 /*
   if (!isPrimitive(obj)) {
     return String(obj) + "[" + Cu.getJSTestingFunctions().objectAddress(obj) + "]";
   }
   return String(obj);
 */
 }
 
-function log(/*...args*/)
+function log(/* ...args*/)
 {
 /*
   for (let arg of args) {
     dump(arg);
     dump(" ");
   }
   dump("\n");
 */
 }
 
-function logPrefetch(/*kind, value1, component, value2*/)
+function logPrefetch(/* kind, value1, component, value2*/)
 {
 /*
   log("prefetching", kind, objAddr(value1) + "." + component, "=", objAddr(value2));
 */
 }
 
 /*
  * All the Op classes (representing Datalog rules) have the same interface:
--- a/toolkit/components/addoncompat/tests/addon/bootstrap.js
+++ b/toolkit/components/addoncompat/tests/addon/bootstrap.js
@@ -59,17 +59,17 @@ function testContentWindow()
       ok(browser.contentWindow, "contentWindow is defined");
       ok(browser.contentDocument, "contentWindow is defined");
       is(gWin.content, browser.contentWindow, "content === contentWindow");
       ok(browser.webNavigation.sessionHistory, "sessionHistory is defined");
 
       ok(browser.contentDocument.getElementById("link"), "link present in document");
 
       // FIXME: Waiting on bug 1073631.
-      //is(browser.contentWindow.wrappedJSObject.global, 3, "global available on document");
+      // is(browser.contentWindow.wrappedJSObject.global, 3, "global available on document");
 
       removeTab(tab, resolve);
     });
   });
 }
 
 // Test for bug 1060046 and bug 1072607. We want to make sure that
 // adding and removing listeners works as expected.
--- a/toolkit/components/asyncshutdown/nsAsyncShutdown.js
+++ b/toolkit/components/asyncshutdown/nsAsyncShutdown.js
@@ -131,17 +131,17 @@ nsAsyncShutdownClient.prototype = {
     return true;
   },
   get jsclient() {
     return this._moduleClient;
   },
   get name() {
     return this._moduleClient.name;
   },
-  addBlocker: function(/*nsIAsyncShutdownBlocker*/ xpcomBlocker,
+  addBlocker: function(/* nsIAsyncShutdownBlocker*/ xpcomBlocker,
       fileName, lineNumber, stack) {
     // We need a Promise-based function with the same behavior as
     // `xpcomBlocker`. Furthermore, to support `removeBlocker`, we
     // need to ensure that we always get the same Promise-based
     // function if we call several `addBlocker`/`removeBlocker` several
     // times with the same `xpcomBlocker`.
     //
     // Ideally, this should be done with a WeakMap() with xpcomBlocker
--- a/toolkit/components/contentprefs/nsContentPrefService.js
+++ b/toolkit/components/contentprefs/nsContentPrefService.js
@@ -44,17 +44,17 @@ cache.set = function CPS_cache_set(group
         break;
     }
   }
 };
 
 const privModeStorage = new ContentPrefStore();
 
 ContentPrefService.prototype = {
-  //**************************************************************************//
+  //* *************************************************************************//
   // XPCOM Plumbing
 
   classID: Components.ID("{e3f772f3-023f-4b32-b074-36cf0fd5d414}"),
 
   QueryInterface: function CPS_QueryInterface(iid) {
     let supportedIIDs = [
       Ci.nsIContentPrefService,
       Ci.nsISupports,
@@ -67,17 +67,17 @@ ContentPrefService.prototype = {
         Cu.import("resource://gre/modules/ContentPrefService2.jsm", s);
         this._contentPrefService2 = new s.ContentPrefService2(this);
       }
       return this._contentPrefService2;
     }
     throw Cr.NS_ERROR_NO_INTERFACE;
   },
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // Convenience Getters
 
   // Observer Service
   __observerSvc: null,
   get _observerSvc() {
     if (!this.__observerSvc)
       this.__observerSvc = Cc["@mozilla.org/observer-service;1"].
                            getService(Ci.nsIObserverService);
@@ -98,17 +98,17 @@ ContentPrefService.prototype = {
   get _prefSvc() {
     if (!this.__prefSvc)
       this.__prefSvc = Cc["@mozilla.org/preferences-service;1"].
                        getService(Ci.nsIPrefBranch);
     return this.__prefSvc;
   },
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // Destruction
 
   _destroy: function ContentPrefService__destroy() {
     this._observerSvc.removeObserver(this, "xpcom-shutdown");
     this._observerSvc.removeObserver(this, "last-pb-context-exited");
 
     // Finalize statements which may have been used asynchronously.
     // FIXME(696499): put them in an object cache like other components.
@@ -186,38 +186,38 @@ ContentPrefService.prototype = {
     delete this._genericObservers;
     delete this.__consoleSvc;
     delete this.__grouper;
     delete this.__observerSvc;
     delete this.__prefSvc;
   },
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // nsIObserver
 
   observe: function ContentPrefService_observe(subject, topic, data) {
     switch (topic) {
       case "xpcom-shutdown":
         this._destroy();
         break;
       case "last-pb-context-exited":
         this._privModeStorage.removeAll();
         break;
     }
   },
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // in-memory cache and private-browsing stores
 
   _cache: cache,
   _privModeStorage: privModeStorage,
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // nsIContentPrefService
 
   getPref: function ContentPrefService_getPref(aGroup, aName, aContext, aCallback) {
     warnDeprecated();
 
     if (!aName)
       throw Components.Exception("aName cannot be null or an empty string",
                                  Cr.NS_ERROR_ILLEGAL_VALUE);
@@ -564,17 +564,17 @@ ContentPrefService.prototype = {
   },
 
   get DBConnection() {
     warnDeprecated();
     return this._dbConnection;
   },
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // Data Retrieval & Modification
 
   __stmtSelectPref: null,
   get _stmtSelectPref() {
     if (!this.__stmtSelectPref)
       this.__stmtSelectPref = this._dbCreateStatement(`
         SELECT prefs.value AS value
         FROM prefs
@@ -992,17 +992,17 @@ ContentPrefService.prototype = {
     if (typeof global != "undefined") {
       prefs.setProperty(null, global);
     }
 
     return prefs;
   },
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // Database Creation & Access
 
   _dbVersion: 4,
 
   _dbSchema: {
     tables: {
       groups:     "id           INTEGER PRIMARY KEY, \
                    name         TEXT NOT NULL",
@@ -1256,23 +1256,23 @@ function warnDeprecated() {
                      "https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIContentPrefService2",
                      Components.stack.caller);
 }
 
 
 function HostnameGrouper() {}
 
 HostnameGrouper.prototype = {
-  //**************************************************************************//
+  //* *************************************************************************//
   // XPCOM Plumbing
 
   classID:          Components.ID("{8df290ae-dcaa-4c11-98a5-2429a4dc97bb}"),
   QueryInterface:   XPCOMUtils.generateQI([Ci.nsIContentURIGrouper]),
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // nsIContentURIGrouper
 
   group: function HostnameGrouper_group(aURI) {
     var group;
 
     try {
       // Accessing the host property of the URI will throw an exception
       // if the URI is of a type that doesn't have a host property.
@@ -1331,13 +1331,13 @@ AsyncStatement.prototype = {
             aReason == Ci.mozIStorageStatementCallback.REASON_FINISHED)
           this._callback.onResult(undefined);
       },
       handleError: function(aError) {}
     });
   }
 };
 
-//****************************************************************************//
+//* ***************************************************************************//
 // XPCOM Plumbing
 
 var components = [ContentPrefService, HostnameGrouper];
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);
--- a/toolkit/components/contentprefs/tests/unit/head_contentPrefs.js
+++ b/toolkit/components/contentprefs/tests/unit/head_contentPrefs.js
@@ -11,17 +11,17 @@ var Cu = Components.utils;
 
 Cu.import('resource://gre/modules/Services.jsm');
 Cu.import('resource://gre/modules/ContentPrefInstance.jsm');
 
 const CONTENT_PREFS_DB_FILENAME = "content-prefs.sqlite";
 const CONTENT_PREFS_BACKUP_DB_FILENAME = "content-prefs.sqlite.corrupt";
 
 var ContentPrefTest = {
-  //**************************************************************************//
+  //* *************************************************************************//
   // Convenience Getters
 
   __dirSvc: null,
   get _dirSvc() {
     if (!this.__dirSvc)
       this.__dirSvc = Cc["@mozilla.org/file/directory_service;1"].
                       getService(Ci.nsIProperties);
     return this.__dirSvc;
@@ -39,45 +39,45 @@ var ContentPrefTest = {
   get _ioSvc() {
     if (!this.__ioSvc)
       this.__ioSvc = Cc["@mozilla.org/network/io-service;1"].
                      getService(Ci.nsIIOService);
     return this.__ioSvc;
   },
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // nsISupports
 
   interfaces: [Ci.nsIDirectoryServiceProvider, Ci.nsISupports],
 
   QueryInterface: function ContentPrefTest_QueryInterface(iid) {
     if (!this.interfaces.some( function(v) { return iid.equals(v) } ))
       throw Cr.NS_ERROR_NO_INTERFACE;
     return this;
   },
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // nsIDirectoryServiceProvider
 
   getFile: function ContentPrefTest_getFile(property, persistent) {
     persistent.value = true;
 
     if (property == "ProfD")
       return this._dirSvc.get("CurProcD", Ci.nsIFile);
 
     // This causes extraneous errors to show up in the log when the directory
     // service asks us first for CurProcD and MozBinD.  I wish there was a way
     // to suppress those errors.
     throw Cr.NS_ERROR_FAILURE;
   },
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // Utilities
 
   getURI: function ContentPrefTest_getURI(spec) {
     return this._ioSvc.newURI(spec, null, null);
   },
 
   /**
    * Get the profile directory.
--- a/toolkit/components/contentprefs/tests/unit/test_contentPrefs.js
+++ b/toolkit/components/contentprefs/tests/unit/test_contentPrefs.js
@@ -1,14 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 function run_test() {
-  //**************************************************************************//
+  //* *************************************************************************//
   // Database Creation, Schema Migration, and Backup
 
   // Note: in these tests we use createInstance instead of getService
   // so we can instantiate the service multiple times and make it run
   // its database initialization code each time.
 
   // Create a new database.
   {
@@ -107,26 +107,26 @@ function run_test() {
 
   var uri = ContentPrefTest.getURI("http://www.example.com/");
 
   // Make sure disk synchronization checking is turned off by default.
   var statement = cps.DBConnection.createStatement("PRAGMA synchronous");
   statement.executeStep();
   do_check_eq(0, statement.getInt32(0));
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // Nonexistent Pref
 
   do_check_eq(cps.getPref(uri, "test.nonexistent.getPref"), undefined);
   do_check_eq(cps.setPref(uri, "test.nonexistent.setPref", 5), undefined);
   do_check_false(cps.hasPref(uri, "test.nonexistent.hasPref"));
   do_check_eq(cps.removePref(uri, "test.nonexistent.removePref"), undefined);
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // Existing Pref
 
   cps.setPref(uri, "test.existing", 5);
 
   // getPref should return the pref value
   do_check_eq(cps.getPref(uri, "test.existing"), 5);
 
   // setPref should return undefined and change the value of the pref
@@ -136,17 +136,17 @@ function run_test() {
   // hasPref should return true
   do_check_true(cps.hasPref(uri, "test.existing"));
 
   // removePref should return undefined and remove the pref
   do_check_eq(cps.removePref(uri, "test.existing"), undefined);
   do_check_false(cps.hasPref(uri, "test.existing"));
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // Round-Trip Data Integrity
 
   // Make sure pref values remain the same from setPref to getPref.
 
   cps.setPref(uri, "test.data-integrity.integer", 5);
   do_check_eq(cps.getPref(uri, "test.data-integrity.integer"), 5);
 
   cps.setPref(uri, "test.data-integrity.float", 5.5);
@@ -179,33 +179,33 @@ function run_test() {
 
   do_check_false(cps.hasPref(uri, "test.data-integrity.integer"));
   do_check_false(cps.hasPref(uri, "test.data-integrity.float"));
   do_check_false(cps.hasPref(uri, "test.data-integrity.boolean"));
   do_check_false(cps.hasPref(uri, "test.data-integrity.string"));
   do_check_false(cps.hasPref(uri, "test.data-integrity.null"));
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // getPrefs
 
   cps.setPref(uri, "test.getPrefs.a", 1);
   cps.setPref(uri, "test.getPrefs.b", 2);
   cps.setPref(uri, "test.getPrefs.c", 3);
 
   var prefs = cps.getPrefs(uri);
   do_check_true(prefs.hasKey("test.getPrefs.a"));
   do_check_eq(prefs.get("test.getPrefs.a"), 1);
   do_check_true(prefs.hasKey("test.getPrefs.b"));
   do_check_eq(prefs.get("test.getPrefs.b"), 2);
   do_check_true(prefs.hasKey("test.getPrefs.c"));
   do_check_eq(prefs.get("test.getPrefs.c"), 3);
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // Site-Specificity
 
   // These are all different sites, and setting a pref for one of them
   // shouldn't set it for the others.
   var uri1 = ContentPrefTest.getURI("http://www.domain1.com/");
   var uri2 = ContentPrefTest.getURI("http://foo.domain1.com/");
   var uri3 = ContentPrefTest.getURI("http://domain1.com/");
   var uri4 = ContentPrefTest.getURI("http://www.domain2.com/");
@@ -226,17 +226,17 @@ function run_test() {
   do_check_false(cps.hasPref(uri4, "test.site-specificity.uri3"));
 
   cps.setPref(uri4, "test.site-specificity.uri4", 5);
   do_check_false(cps.hasPref(uri1, "test.site-specificity.uri4"));
   do_check_false(cps.hasPref(uri2, "test.site-specificity.uri4"));
   do_check_false(cps.hasPref(uri3, "test.site-specificity.uri4"));
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // Observers
 
   var specificObserver = {
     interfaces: [Ci.nsIContentPrefObserver, Ci.nsISupports],
 
     QueryInterface: function ContentPrefTest_QueryInterface(iid) {
       if (!this.interfaces.some( function(v) { return iid.equals(v) } ))
         throw Cr.NS_ERROR_NO_INTERFACE;
@@ -328,17 +328,17 @@ function run_test() {
   cps.setPref(uri, "test.observer.1", "test value");
   cps.removePref(uri, "test.observer.1", "test value");
   do_check_eq(specificObserver.numTimesSetCalled, 1);
   do_check_eq(genericObserver.numTimesSetCalled, 4);
   do_check_eq(specificObserver.numTimesRemovedCalled, 1);
   do_check_eq(genericObserver.numTimesRemovedCalled, 3);
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // Get/Remove Prefs By Name
 
   {
     var anObserver = {
       interfaces: [Ci.nsIContentPrefObserver, Ci.nsISupports],
 
       QueryInterface: function ContentPrefTest_QueryInterface(iid) {
         if (!this.interfaces.some( function(v) { return iid.equals(v) } ))
@@ -416,17 +416,17 @@ function run_test() {
 
     // Clean up after ourselves
     cps.removePref(uri1, "test.byname.2");
     cps.removePref(uri3, "test.byname.3");
     cps.removePref(null, "test.byname.2");
   }
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // Clear Private Data Pref Removal
 
   {
     let uri1 = ContentPrefTest.getURI("http://www.domain1.com/");
     let uri2 = ContentPrefTest.getURI("http://www.domain2.com/");
     let uri3 = ContentPrefTest.getURI("http://www.domain3.com/");
 
     let dbConnection = cps.DBConnection;
--- a/toolkit/components/cookie/content/cookieAcceptDialog.js
+++ b/toolkit/components/cookie/content/cookieAcceptDialog.js
@@ -35,17 +35,17 @@ function onload()
 
   // hook up button icons where implemented
   document.getElementById("ok").setAttribute("icon", "accept");
   document.getElementById("cancel").setAttribute("icon", "cancel");
   document.getElementById("disclosureButton").setAttribute("icon", "properties");
 
   cookieBundle = document.getElementById("cookieBundle");
 
-  //cache strings
+  // cache strings
   if (!showDetails) {
     showDetails = cookieBundle.getString('showDetails');
   }
   if (!hideDetails) {
     hideDetails = cookieBundle.getString('hideDetails');
   }
   detailsAccessKey = cookieBundle.getString('detailsAccessKey');
 
--- a/toolkit/components/crashes/tests/xpcshell/test_crash_manager.js
+++ b/toolkit/components/crashes/tests/xpcshell/test_crash_manager.js
@@ -286,17 +286,17 @@ add_task(function* test_main_crash_event
 add_task(function* test_crash_submission_event_file() {
   let m = yield getManager();
   yield m.createEventsFile("1", "crash.main.2", DUMMY_DATE, "crash1");
   yield m.createEventsFile("1-submission", "crash.submission.1", DUMMY_DATE_2,
                            "crash1\nfalse\n");
 
   // The line below has been intentionally commented out to make sure that
   // the crash record is created when one does not exist.
-  //yield m.createEventsFile("2", "crash.main.1", DUMMY_DATE, "crash2");
+  // yield m.createEventsFile("2", "crash.main.1", DUMMY_DATE, "crash2");
   yield m.createEventsFile("2-submission", "crash.submission.1", DUMMY_DATE_2,
                            "crash2\ntrue\nbp-2");
   let count = yield m.aggregateEventsFiles();
   Assert.equal(count, 3);
 
   let crashes = yield m.getCrashes();
   Assert.equal(crashes.length, 2);
 
--- a/toolkit/components/downloads/nsDownloadManagerUI.js
+++ b/toolkit/components/downloads/nsDownloadManagerUI.js
@@ -1,33 +1,33 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
-////////////////////////////////////////////////////////////////////////////////
-//// Constants
+// //////////////////////////////////////////////////////////////////////////////
+// // Constants
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cr = Components.results;
 const DOWNLOAD_MANAGER_URL = "chrome://mozapps/content/downloads/downloads.xul";
 const PREF_FLASH_COUNT = "browser.download.manager.flashCount";
 
-////////////////////////////////////////////////////////////////////////////////
-//// nsDownloadManagerUI class
+// //////////////////////////////////////////////////////////////////////////////
+// // nsDownloadManagerUI class
 
 function nsDownloadManagerUI() {}
 
 nsDownloadManagerUI.prototype = {
   classID: Components.ID("7dfdf0d1-aff6-4a34-bad1-d0fe74601642"),
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsIDownloadManagerUI
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsIDownloadManagerUI
 
   show: function show(aWindowContext, aDownload, aReason, aUsePrivateUI)
   {
     if (!aReason)
       aReason = Ci.nsIDownloadManagerUI.REASON_USER_INTERACTED;
 
     // First we see if it is already visible
     let window = this.recentWindow;
@@ -85,29 +85,29 @@ nsDownloadManagerUI.prototype = {
     try {
       flashCount = prefs.getIntPref(PREF_FLASH_COUNT);
     } catch (e) { }
 
     var win = this.recentWindow.QueryInterface(Ci.nsIDOMChromeWindow);
     win.getAttentionWithCycleCount(flashCount);
   },
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsDownloadManagerUI
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsDownloadManagerUI
 
   get recentWindow() {
     var wm = Cc["@mozilla.org/appshell/window-mediator;1"].
              getService(Ci.nsIWindowMediator);
     return wm.getMostRecentWindow("Download:Manager");
   },
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsISupports
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsISupports
 
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIDownloadManagerUI])
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// Module
+// //////////////////////////////////////////////////////////////////////////////
+// // Module
 
 var components = [nsDownloadManagerUI];
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);
 
--- a/toolkit/components/downloads/test/unit/tail_download_manager.js
+++ b/toolkit/components/downloads/test/unit/tail_download_manager.js
@@ -5,18 +5,18 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
  * Provides infrastructure for automated download components tests.
  */
 
 "use strict";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Termination functions common to all tests
+// //////////////////////////////////////////////////////////////////////////////
+// // Termination functions common to all tests
 
 add_task(function* test_common_terminate()
 {
   // Stop the HTTP server.  We must do this inside a task in "tail.js" until the
   // xpcshell testing framework supports asynchronous termination functions.
   let deferred = Promise.defer();
   gHttpServer.stop(deferred.resolve);
   yield deferred.promise;
--- a/toolkit/components/downloads/test/unit/test_app_rep_maclinux.js
+++ b/toolkit/components/downloads/test/unit/test_app_rep_maclinux.js
@@ -3,18 +3,18 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * This file tests signature extraction using Windows Authenticode APIs of
  * downloaded files.
  */
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
                                   "resource://gre/modules/NetUtil.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Promise",
                                   "resource://gre/modules/Promise.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Task",
@@ -59,18 +59,18 @@ function registerTableUpdate(aTable, aFi
     do_print("Length of " + aFilename + ": " + contents.length);
     response.setHeader("Content-Type",
                        "application/vnd.google.safebrowsing-update", false);
     response.setStatusLine(request.httpVersion, 200, "OK");
     response.bodyOutputStream.write(contents, contents.length);
   });
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Tests
+// //////////////////////////////////////////////////////////////////////////////
+// // Tests
 
 function run_test()
 {
   run_next_test();
 }
 
 add_task(function test_setup()
 {
--- a/toolkit/components/downloads/test/unit/test_app_rep_windows.js
+++ b/toolkit/components/downloads/test/unit/test_app_rep_windows.js
@@ -3,18 +3,18 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * This file tests signature extraction using Windows Authenticode APIs of
  * downloaded files.
  */
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
                                   "resource://gre/modules/FileUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
                                   "resource://gre/modules/NetUtil.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Promise",
@@ -155,18 +155,18 @@ function registerTableUpdate(aTable, aFi
     do_print("Length of " + aFilename + ": " + contents.length);
     response.setHeader("Content-Type",
                        "application/vnd.google.safebrowsing-update", false);
     response.setStatusLine(request.httpVersion, 200, "OK");
     response.bodyOutputStream.write(contents, contents.length);
   });
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Tests
+// //////////////////////////////////////////////////////////////////////////////
+// // Tests
 
 function run_test()
 {
   run_next_test();
 }
 
 add_task(function* test_setup()
 {
--- a/toolkit/components/exthelper/extApplication.js
+++ b/toolkit/components/exthelper/extApplication.js
@@ -1,23 +1,23 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 Components.utils.import("resource://gre/modules/AddonManager.jsm");
 
-//=================================================
+// =================================================
 // Console constructor
 function Console() {
   this._console = Components.classes["@mozilla.org/consoleservice;1"]
                             .getService(Ci.nsIConsoleService);
 }
 
-//=================================================
+// =================================================
 // Console implementation
 Console.prototype = {
   log: function cs_log(aMsg) {
     this._console.logStringMessage(aMsg);
   },
 
   open: function cs_open() {
     var wMediator = Components.classes["@mozilla.org/appshell/window-mediator;1"]
@@ -33,24 +33,24 @@ Console.prototype = {
       console.focus();
     }
   },
 
   QueryInterface: XPCOMUtils.generateQI([Ci.extIConsole])
 };
 
 
-//=================================================
+// =================================================
 // EventItem constructor
 function EventItem(aType, aData) {
   this._type = aType;
   this._data = aData;
 }
 
-//=================================================
+// =================================================
 // EventItem implementation
 EventItem.prototype = {
   _cancel: false,
 
   get type() {
     return this._type;
   },
 
@@ -61,24 +61,24 @@ EventItem.prototype = {
   preventDefault: function ei_pd() {
     this._cancel = true;
   },
 
   QueryInterface: XPCOMUtils.generateQI([Ci.extIEventItem])
 };
 
 
-//=================================================
+// =================================================
 // Events constructor
 function Events(notifier) {
   this._listeners = [];
   this._notifier = notifier;
 }
 
-//=================================================
+// =================================================
 // Events implementation
 Events.prototype = {
   addListener: function evts_al(aEvent, aListener) {
     function hasFilter(element) {
       return element.event == aEvent && element.listener == aListener;
     }
 
     if (this._listeners.some(hasFilter))
@@ -114,17 +114,17 @@ Events.prototype = {
     });
 
     return !eventItem._cancel;
   },
 
   QueryInterface: XPCOMUtils.generateQI([Ci.extIEvents])
 };
 
-//=================================================
+// =================================================
 // PreferenceObserver (internal class)
 //
 // PreferenceObserver is a global singleton which watches the browser's
 // preferences and sends you events when things change.
 
 function PreferenceObserver() {
   this._observersDict = {};
 }
@@ -188,17 +188,17 @@ PreferenceObserver.prototype = {
       delete this._observersDict[root][aDomain];
       if (Object.keys(this._observersDict[root]).length == 0) {
         delete this._observersDict[root];
       }
     }
   }
 };
 
-//=================================================
+// =================================================
 // PreferenceBranch constructor
 function PreferenceBranch(aBranch) {
   if (!aBranch)
     aBranch = "";
 
   this._root = aBranch;
   this._prefs = Components.classes["@mozilla.org/preferences-service;1"]
                           .getService(Ci.nsIPrefService)
@@ -214,17 +214,17 @@ function PreferenceBranch(aBranch) {
     },
     removeListener: function pb_rl(aEvent, aListener) {
       gPreferenceObserver.removeListener(prefs, "", aEvent, aListener);
     },
     QueryInterface: XPCOMUtils.generateQI([Ci.extIEvents])
   };
 }
 
-//=================================================
+// =================================================
 // PreferenceBranch implementation
 PreferenceBranch.prototype = {
   get root() {
     return this._root;
   },
 
   get all() {
     return this.find({});
@@ -301,17 +301,17 @@ PreferenceBranch.prototype = {
   reset: function prefs_reset() {
     this._prefs.resetBranch("");
   },
 
   QueryInterface: XPCOMUtils.generateQI([Ci.extIPreferenceBranch])
 };
 
 
-//=================================================
+// =================================================
 // Preference constructor
 function Preference(aName, aBranch) {
   this._name = aName;
   this._branch = aBranch;
 
   var self = this;
   this._events = {
     addListener: function pref_al(aEvent, aListener) {
@@ -319,17 +319,17 @@ function Preference(aName, aBranch) {
     },
     removeListener: function pref_rl(aEvent, aListener) {
       gPreferenceObserver.removeListener(self._branch._prefs, self._name, aEvent, aListener);
     },
     QueryInterface: XPCOMUtils.generateQI([Ci.extIEvents])
   };
 }
 
-//=================================================
+// =================================================
 // Preference implementation
 Preference.prototype = {
   get name() {
     return this._name;
   },
 
   get type() {
     var value = "";
@@ -381,24 +381,24 @@ Preference.prototype = {
   reset: function pref_reset() {
     this.branch._prefs.clearUserPref(this.name);
   },
 
   QueryInterface: XPCOMUtils.generateQI([Ci.extIPreference])
 };
 
 
-//=================================================
+// =================================================
 // SessionStorage constructor
 function SessionStorage() {
   this._storage = {};
   this._events = new Events();
 }
 
-//=================================================
+// =================================================
 // SessionStorage implementation
 SessionStorage.prototype = {
   get events() {
     return this._events;
   },
 
   has: function ss_has(aName) {
     return this._storage.hasOwnProperty(aName);
@@ -411,30 +411,30 @@ SessionStorage.prototype = {
 
   get: function ss_get(aName, aDefaultValue) {
     return this.has(aName) ? this._storage[aName] : aDefaultValue;
   },
 
   QueryInterface : XPCOMUtils.generateQI([Ci.extISessionStorage])
 };
 
-//=================================================
+// =================================================
 // ExtensionObserver constructor (internal class)
 //
 // ExtensionObserver is a global singleton which watches the browser's
 // extensions and sends you events when things change.
 
 function ExtensionObserver() {
   this._eventsDict = {};
 
   AddonManager.addAddonListener(this);
   AddonManager.addInstallListener(this);
 }
 
-//=================================================
+// =================================================
 // ExtensionObserver implementation (internal class)
 ExtensionObserver.prototype = {
   onDisabling: function eo_onDisabling(addon, needsRestart) {
     this._dispatchEvent(addon.id, "disable");
   },
 
   onEnabling: function eo_onEnabling(addon, needsRestart) {
     this._dispatchEvent(addon.id, "enable");
@@ -475,17 +475,17 @@ ExtensionObserver.prototype = {
   _dispatchEvent: function eo_dispatchEvent(aId, aEvent) {
     var events = this._eventsDict[aId];
     if (events) {
       events.dispatch(aEvent, aId);
     }
   }
 };
 
-//=================================================
+// =================================================
 // Extension constructor
 function Extension(aItem) {
   this._item = aItem;
   this._firstRun = false;
   this._prefs = new PreferenceBranch("extensions." + this.id + ".");
   this._storage = new SessionStorage();
 
   let id = this.id;
@@ -501,17 +501,17 @@ function Extension(aItem) {
 
   var installPref = "install-event-fired";
   if (!this._prefs.has(installPref)) {
     this._prefs.setValue(installPref, true);
     this._firstRun = true;
   }
 }
 
-//=================================================
+// =================================================
 // Extension implementation
 Extension.prototype = {
   get id() {
     return this._item.id;
   },
 
   get name() {
     return this._item.name;
@@ -540,27 +540,27 @@ Extension.prototype = {
   get events() {
     return this._events;
   },
 
   QueryInterface: XPCOMUtils.generateQI([Ci.extIExtension])
 };
 
 
-//=================================================
+// =================================================
 // Extensions constructor
 function Extensions(addons) {
   this._cache = {};
 
   addons.forEach(function (addon) {
     this._cache[addon.id] = new Extension(addon);
   }, this);
 }
 
-//=================================================
+// =================================================
 // Extensions implementation
 Extensions.prototype = {
   get all() {
     return this.find({});
   },
 
   // XXX: Disabled until we can figure out the wrapped object issues
   // id: "some@id" or /id/
@@ -578,28 +578,28 @@ Extensions.prototype = {
 
   get: function exts_get(aId) {
     return this.has(aId) ? this._cache[aId] : null;
   },
 
   QueryInterface: XPCOMUtils.generateQI([Ci.extIExtensions])
 };
 
-//=================================================
+// =================================================
 // Application globals
 
 var gExtensionObserver = new ExtensionObserver();
 var gPreferenceObserver = new PreferenceObserver();
 
-//=================================================
+// =================================================
 // extApplication constructor
 function extApplication() {
 }
 
-//=================================================
+// =================================================
 // extApplication implementation
 extApplication.prototype = {
   initToolkitHelpers: function extApp_initToolkitHelpers() {
     XPCOMUtils.defineLazyServiceGetter(this, "_info",
                                        "@mozilla.org/xre/app-info;1",
                                        "nsIXULAppInfo");
 
     this._obs = Cc["@mozilla.org/observer-service;1"].
--- a/toolkit/components/feeds/FeedProcessor.js
+++ b/toolkit/components/feeds/FeedProcessor.js
@@ -43,17 +43,17 @@ const SAX_CONTRACTID = "@mozilla.org/sax
 const PARSERUTILS_CONTRACTID = "@mozilla.org/parserutils;1";
 
 
 var gIoService = null;
 
 const XMLNS = "http://www.w3.org/XML/1998/namespace";
 const RSS090NS = "http://my.netscape.com/rdf/simple/0.9/";
 
-/***** Some general utils *****/
+/** *** Some general utils *****/
 function strToURI(link, base) {
   base = base || null;
   if (!gIoService)
     gIoService = Cc[IO_CONTRACTID].getService(Ci.nsIIOService);
   try {
     return gIoService.newURI(link, null, base);
   }
   catch (e) {
@@ -1033,17 +1033,17 @@ function FeedElementInfo(fieldName, feed
  * want to include in our object model, but we do need to keep track
  * of during parsing.
  */
 function WrapperElementInfo(fieldName) {
   this.isWrapper = true;
   this.fieldName = fieldName;
 }
 
-/***** The Processor *****/
+/** *** The Processor *****/
 function FeedProcessor() {
   this._reader = Cc[SAX_CONTRACTID].createInstance(Ci.nsISAXXMLReader);
   this._buf =  "";
   this._feed = Cc[BAG_CONTRACTID].createInstance(Ci.nsIWritablePropertyBag2);
   this._handlerStack = [];
   this._xmlBaseStack = []; // sparse array keyed to nesting depth
   this._depth = 0;
   this._state = "START";
@@ -1071,31 +1071,31 @@ function FeedProcessor() {
                           "atom03:title":"text",
                           "atom03:tagline":"text",
                           "atom03:summary":"text",
                           "atom03:content":"text"};
   this._stack = [];
 
   this._trans = {
     "START": {
-      //If we hit a root RSS element, treat as RSS2.
+      // If we hit a root RSS element, treat as RSS2.
       "rss": new FeedElementInfo("RSS2", "rss2"),
 
       // If we hit an RDF element, if could be RSS1, but we can't
       // verify that until we hit a rss1:channel element.
       "rdf:RDF": new WrapperElementInfo("RDF"),
 
       // If we hit a Atom 1.0 element, treat as Atom 1.0.
       "atom:feed": new FeedElementInfo("Atom", "atom"),
 
       // Treat as Atom 0.3
       "atom03:feed": new FeedElementInfo("Atom03", "atom03"),
     },
 
-    /********* RSS2 **********/
+    /** ******* RSS2 **********/
     "IN_RSS2": {
       "channel": new WrapperElementInfo("channel")
     },
 
     "IN_CHANNEL": {
       "item": new ElementInfo("items", Cc[ENTRY_CONTRACTID], null, true),
       "managingEditor": new ElementInfo("authors", Cc[PERSON_CONTRACTID],
                                         rssAuthor, true),
@@ -1140,17 +1140,17 @@ function FeedProcessor() {
       "hour": new ElementInfo("hours", null, rssArrayElement, true)
     },
 
     "IN_MEDIAGROUP": {
       "media:content": new ElementInfo("mediacontent", null, null, true),
       "media:thumbnail": new ElementInfo("mediathumbnail", null, null, true)
     },
 
-    /********* RSS1 **********/
+    /** ******* RSS1 **********/
     "IN_RDF": {
       // If we hit a rss1:channel, we can verify that we have RSS1
       "rss1:channel": new FeedElementInfo("rdf_channel", "rss1"),
       "rss1:image": new ElementInfo("image", null, null, false),
       "rss1:textinput": new ElementInfo("textInput", null, null, false),
       "rss1:item": new ElementInfo("items", Cc[ENTRY_CONTRACTID], null, true),
     },
 
@@ -1161,17 +1161,17 @@ function FeedProcessor() {
       "dc:creator": new ElementInfo("authors", Cc[PERSON_CONTRACTID],
                                     rssAuthor, true),
       "dc:author": new ElementInfo("authors", Cc[PERSON_CONTRACTID],
                                    rssAuthor, true),
       "dc:contributor": new ElementInfo("contributors", Cc[PERSON_CONTRACTID],
                                          rssAuthor, true),
     },
 
-    /********* ATOM 1.0 **********/
+    /** ******* ATOM 1.0 **********/
     "IN_ATOM": {
       "atom:author": new ElementInfo("authors", Cc[PERSON_CONTRACTID],
                                      null, true),
       "atom:generator": new ElementInfo("generator", Cc[GENERATOR_CONTRACTID],
                                         atomGenerator, false),
       "atom:contributor": new ElementInfo("contributors",  Cc[PERSON_CONTRACTID],
                                           null, true),
       "atom:link": new ElementInfo("links", null, null, true),
@@ -1183,17 +1183,17 @@ function FeedProcessor() {
     "IN_ENTRIES": {
       "atom:author": new ElementInfo("authors", Cc[PERSON_CONTRACTID],
                                      null, true),
       "atom:contributor": new ElementInfo("contributors", Cc[PERSON_CONTRACTID],
                                           null, true),
       "atom:link": new ElementInfo("links", null, null, true),
     },
 
-    /********* ATOM 0.3 **********/
+    /** ******* ATOM 0.3 **********/
     "IN_ATOM03": {
       "atom03:author": new ElementInfo("authors", Cc[PERSON_CONTRACTID],
                                        null, true),
       "atom03:contributor": new ElementInfo("contributors",
                                             Cc[PERSON_CONTRACTID],
                                             null, true),
       "atom03:link": new ElementInfo("links", null, null, true),
       "atom03:entry": new ElementInfo("atom03_entries", Cc[ENTRY_CONTRACTID],
@@ -1311,25 +1311,25 @@ FeedProcessor.prototype = {
 
   // We only care about fatal errors. When this happens, we may have
   // parsed through the feed metadata and some number of entries. The
   // listener can still show some of that data if it wants, and we'll
   // set the bozo bit to indicate we were unable to parse all the way
   // through.
   fatalError: function FP_reportError() {
     this._result.bozo = true;
-    //XXX need to QI to FeedProgressListener
+    // XXX need to QI to FeedProgressListener
     if (!this._haveSentResult)
       this._sendResult();
   },
 
   // nsISAXContentHandler
 
   startDocument: function FP_startDocument() {
-    //LOG("----------");
+    // LOG("----------");
   },
 
   endDocument: function FP_endDocument() {
     if (!this._haveSentResult)
       this._sendResult();
   },
 
   // The transitions defined above identify elements that contain more
@@ -1359,17 +1359,17 @@ FeedProcessor.prototype = {
   // formats allow this by default, and I don't of any extension that
   // works this way.
   //
   startElement: function FP_startElement(uri, localName, qName, attributes) {
     this._buf = "";
     ++this._depth;
     var elementInfo;
 
-    //LOG("<" + localName + ">");
+    // LOG("<" + localName + ">");
 
     // Check for xml:base
     var base = attributes.getValueFromName(XMLNS, "base");
     if (base) {
       this._xmlBaseStack[this._depth] =
         strToURI(base, this._xmlBaseStack[this._xmlBaseStack.length - 1]);
     }
 
@@ -1450,17 +1450,17 @@ FeedProcessor.prototype = {
 
   // In the endElement handler, we decrement the stack and look
   // for cleanup/transition functions to execute. The second part
   // of the state transition works as above in startElement, but
   // the state we're looking for is prefixed with an underscore
   // to distinguish endElement events from startElement events.
   endElement:  function FP_endElement(uri, localName, qName) {
     var elementInfo = this._handlerStack[this._depth];
-    //LOG("</" + localName + ">");
+    // LOG("</" + localName + ">");
     if (elementInfo && !elementInfo.isWrapper)
       this._closeComplexElement(elementInfo);
 
     // cut down xml:base context
     if (this._xmlBaseStack.length == this._depth + 1)
       this._xmlBaseStack = this._xmlBaseStack.slice(0, this._depth);
 
     // our new state is whatever is at the top of the stack now
--- a/toolkit/components/filepicker/content/filepicker.js
+++ b/toolkit/components/filepicker/content/filepicker.js
@@ -233,17 +233,17 @@ function selectOnOK()
     var file = fileList[curFileIndex].QueryInterface(nsIFile);
 
     // try to normalize - if this fails we will ignore the error
     // because we will notice the
     // error later and show a fitting error alert.
     try {
       file.normalize();
     } catch (e) {
-      //promptService.alert(window, "Problem", "normalize failed, continuing");
+      // promptService.alert(window, "Problem", "normalize failed, continuing");
     }
 
     var fileExists = file.exists();
 
     if (!fileExists && (filePickerMode == nsIFilePicker.modeOpen ||
                         filePickerMode == nsIFilePicker.modeOpenMultiple)) {
       showErrorDialog("errorOpenFileDoesntExistTitle",
                       "errorOpenFileDoesntExistMessage",
--- a/toolkit/components/filepicker/nsFilePicker.js
+++ b/toolkit/components/filepicker/nsFilePicker.js
@@ -238,27 +238,27 @@ nsFilePicker.prototype = {
       }
       if (aFilePickerShownCallback) {
         aFilePickerShownCallback.done(result);
       }
     }.bind(this), Components.interfaces.nsIThread.DISPATCH_NORMAL);
   },
 
   show: function() {
-    var o = new Object();
+    var o = {};
     o.title = this.mTitle;
     o.mode = this.mMode;
     o.displayDirectory = this.mDisplayDirectory;
     o.defaultString = this.mDefaultString;
     o.filterIndex = this.mFilterIndex;
-    o.filters = new Object();
+    o.filters = {};
     o.filters.titles = this.mFilterTitles;
     o.filters.types = this.mFilters;
     o.allowURLs = this.mAllowURLs;
-    o.retvals = new Object();
+    o.retvals = {};
 
     var parent;
     if (this.mParentWindow) {
       parent = this.mParentWindow;
     } else if (typeof(window) == "object" && window != null) {
       parent = window;
     } else {
       try {
--- a/toolkit/components/jsdownloads/src/DownloadCore.jsm
+++ b/toolkit/components/jsdownloads/src/DownloadCore.jsm
@@ -45,18 +45,18 @@ this.EXPORTED_SYMBOLS = [
   "DownloadTarget",
   "DownloadError",
   "DownloadSaver",
   "DownloadCopySaver",
   "DownloadLegacySaver",
   "DownloadPDFSaver",
 ];
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 const Cr = Components.results;
 
 Cu.import("resource://gre/modules/Integration.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
@@ -137,18 +137,18 @@ function deserializeUnknownProperties(aO
 
 /**
  * This determines the minimum time interval between updates to the number of
  * bytes transferred, and is a limiting factor to the sequence of readings used
  * in calculating the speed of the download.
  */
 const kProgressUpdateIntervalMs = 400;
 
-////////////////////////////////////////////////////////////////////////////////
-//// Download
+// //////////////////////////////////////////////////////////////////////////////
+// // Download
 
 /**
  * Represents a single download, with associated state and actions.  This object
  * is transient, though it can be included in a DownloadList so that it can be
  * managed by the user interface and persisted across sessions.
  */
 this.Download = function ()
 {
@@ -1244,18 +1244,18 @@ Download.fromSerializable = function (aS
     property != "source" &&
     property != "target" &&
     property != "error" &&
     property != "saver");
 
   return download;
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// DownloadSource
+// //////////////////////////////////////////////////////////////////////////////
+// // DownloadSource
 
 /**
  * Represents the source of a download, for example a document or an URI.
  */
 this.DownloadSource = function () {}
 
 this.DownloadSource.prototype = {
   /**
@@ -1371,18 +1371,18 @@ this.DownloadSource.fromSerializable = f
 
     deserializeUnknownProperties(source, aSerializable, property =>
       property != "url" && property != "isPrivate" && property != "referrer");
   }
 
   return source;
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// DownloadTarget
+// //////////////////////////////////////////////////////////////////////////////
+// // DownloadTarget
 
 /**
  * Represents the target of a download, for example a file in the global
  * downloads directory, or a file in the system temporary directory.
  */
 this.DownloadTarget = function () {}
 
 this.DownloadTarget.prototype = {
@@ -1500,18 +1500,18 @@ this.DownloadTarget.fromSerializable = f
     }
 
     deserializeUnknownProperties(target, aSerializable, property =>
       property != "path" && property != "partFilePath");
   }
   return target;
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// DownloadError
+// //////////////////////////////////////////////////////////////////////////////
+// // DownloadError
 
 /**
  * Provides detailed information about a download failure.
  *
  * @param aProperties
  *        Object which may contain any of the following properties:
  *          {
  *            result: Result error code, defaulting to Cr.NS_ERROR_FAILURE
@@ -1696,18 +1696,18 @@ this.DownloadError.fromSerializable = fu
     property != "becauseBlockedByParentalControls" &&
     property != "becauseBlockedByReputationCheck" &&
     property != "becauseBlockedByRuntimePermissions" &&
     property != "reputationCheckVerdict");
 
   return e;
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// DownloadSaver
+// //////////////////////////////////////////////////////////////////////////////
+// // DownloadSaver
 
 /**
  * Template for an object that actually transfers the data for the download.
  */
 this.DownloadSaver = function () {}
 
 this.DownloadSaver.prototype = {
   /**
@@ -1855,18 +1855,18 @@ this.DownloadSaver.fromSerializable = fu
       saver = DownloadPDFSaver.fromSerializable(serializable);
       break;
     default:
       throw new Error("Unrecoginzed download saver type.");
   }
   return saver;
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// DownloadCopySaver
+// //////////////////////////////////////////////////////////////////////////////
+// // DownloadCopySaver
 
 /**
  * Saver object that simply copies the entire source file to the target.
  */
 this.DownloadCopySaver = function () {}
 
 this.DownloadCopySaver.prototype = {
   __proto__: DownloadSaver.prototype,
@@ -2335,18 +2335,18 @@ this.DownloadCopySaver.fromSerializable 
   }
 
   deserializeUnknownProperties(saver, aSerializable, property =>
     property != "entityID" && property != "type");
 
   return saver;
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// DownloadLegacySaver
+// //////////////////////////////////////////////////////////////////////////////
+// // DownloadLegacySaver
 
 /**
  * Saver object that integrates with the legacy nsITransfer interface.
  *
  * For more background on the process, see the DownloadLegacyTransfer object.
  */
 this.DownloadLegacySaver = function ()
 {
@@ -2719,18 +2719,18 @@ this.DownloadLegacySaver.prototype = {
  * Returns a new DownloadLegacySaver object.  This saver type has a
  * deserializable form only when creating a new object in memory, because it
  * cannot be serialized to disk.
  */
 this.DownloadLegacySaver.fromSerializable = function () {
   return new DownloadLegacySaver();
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// DownloadPDFSaver
+// //////////////////////////////////////////////////////////////////////////////
+// // DownloadPDFSaver
 
 /**
  * This DownloadSaver type creates a PDF file from the current document in a
  * given window, specified using the windowRef property of the DownloadSource
  * object associated with the download.
  *
  * In order to prevent the download from saving a different document than the one
  * originally loaded in the window, any attempt to restart the download will fail.
--- a/toolkit/components/jsdownloads/src/DownloadImport.jsm
+++ b/toolkit/components/jsdownloads/src/DownloadImport.jsm
@@ -5,18 +5,18 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
 this.EXPORTED_SYMBOLS = [
   "DownloadImport",
 ];
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 const Cr = Components.results;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
@@ -37,18 +37,18 @@ XPCOMUtils.defineLazyModuleGetter(this, 
  * These are the only types of download states that
  * we will import.
  */
 const DOWNLOAD_NOTSTARTED = -1;
 const DOWNLOAD_DOWNLOADING = 0;
 const DOWNLOAD_PAUSED = 4;
 const DOWNLOAD_QUEUED = 5;
 
-////////////////////////////////////////////////////////////////////////////////
-//// DownloadImport
+// //////////////////////////////////////////////////////////////////////////////
+// // DownloadImport
 
 /**
  * Provides an object that has a method to import downloads
  * from the previous SQLite storage format.
  *
  * @param aList   A DownloadList where each successfully
  *                imported download will be added.
  * @param aPath   The path to the database file.
--- a/toolkit/components/jsdownloads/src/DownloadLegacy.js
+++ b/toolkit/components/jsdownloads/src/DownloadLegacy.js
@@ -11,33 +11,33 @@
  * New code is expected to use the "Downloads.jsm" module directly, without
  * going through the interfaces implemented in this XPCOM component.  These
  * interfaces are only maintained for backwards compatibility with components
  * that still work synchronously on the main thread.
  */
 
 "use strict";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 const Cr = Components.results;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "Downloads",
                                   "resource://gre/modules/Downloads.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Promise",
                                   "resource://gre/modules/Promise.jsm");
 
-////////////////////////////////////////////////////////////////////////////////
-//// DownloadLegacyTransfer
+// //////////////////////////////////////////////////////////////////////////////
+// // DownloadLegacyTransfer
 
 /**
  * nsITransfer implementation that provides a bridge to a Download object.
  *
  * Legacy downloads work differently than the JavaScript implementation.  In the
  * latter, the caller only provides the properties for the Download object and
  * the entire process is handled by the "start" method.  In the legacy
  * implementation, the caller must create a separate object to execute the
@@ -65,25 +65,25 @@ XPCOMUtils.defineLazyModuleGetter(this, 
 function DownloadLegacyTransfer()
 {
   this._deferDownload = Promise.defer();
 }
 
 DownloadLegacyTransfer.prototype = {
   classID: Components.ID("{1b4c85df-cbdd-4bb6-b04e-613caece083c}"),
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsISupports
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsISupports
 
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
                                          Ci.nsIWebProgressListener2,
                                          Ci.nsITransfer]),
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsIWebProgressListener
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsIWebProgressListener
 
   onStateChange: function DLT_onStateChange(aWebProgress, aRequest, aStateFlags,
                                             aStatus)
   {
     if (!Components.isSuccessCode(aStatus)) {
       this._componentFailed = true;
     }
 
@@ -185,18 +185,18 @@ DownloadLegacyTransfer.prototype = {
       this._deferDownload.promise.then(function DLT_OSC_onDownload(aDownload) {
         aDownload.saver.onTransferFinished(aRequest, aStatus);
       }).then(null, Cu.reportError);
     }
   },
 
   onSecurityChange: function () { },
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsIWebProgressListener2
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsIWebProgressListener2
 
   onProgressChange64: function DLT_onProgressChange64(aWebProgress, aRequest,
                                                       aCurSelfProgress,
                                                       aMaxSelfProgress,
                                                       aCurTotalProgress,
                                                       aMaxTotalProgress)
   {
     // Wait for the associated Download object to be available.
@@ -208,18 +208,18 @@ DownloadLegacyTransfer.prototype = {
   onRefreshAttempted: function DLT_onRefreshAttempted(aWebProgress, aRefreshURI,
                                                       aMillis, aSameURI)
   {
     // Indicate that refreshes and redirects are allowed by default.  However,
     // note that download components don't usually call this method at all.
     return true;
   },
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsITransfer
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsITransfer
 
   init: function DLT_init(aSource, aTarget, aDisplayName, aMIMEInfo, aStartTime,
                           aTempFile, aCancelable, aIsPrivate)
   {
     this._cancelable = aCancelable;
 
     let launchWhenSucceeded = false, contentType = null, launcherPath = null;
 
@@ -273,18 +273,18 @@ DownloadLegacyTransfer.prototype = {
     this._signatureInfo = signatureInfo;
   },
 
   setRedirects: function (redirects)
   {
     this._redirects = redirects;
   },
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// Private methods and properties
+  // ////////////////////////////////////////////////////////////////////////////
+  // // Private methods and properties
 
   /**
    * This deferred object contains a promise that is resolved with the Download
    * object associated with this nsITransfer instance, when it is available.
    */
   _deferDownload: null,
 
   /**
@@ -306,12 +306,12 @@ DownloadLegacyTransfer.prototype = {
   _sha256Hash: null,
 
   /**
    * Save the signature info in a serialized protobuf of the downloaded file.
    */
   _signatureInfo: null,
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// Module
+// //////////////////////////////////////////////////////////////////////////////
+// // Module
 
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory([DownloadLegacyTransfer]);
--- a/toolkit/components/jsdownloads/src/DownloadList.jsm
+++ b/toolkit/components/jsdownloads/src/DownloadList.jsm
@@ -21,33 +21,33 @@
 "use strict";
 
 this.EXPORTED_SYMBOLS = [
   "DownloadList",
   "DownloadCombinedList",
   "DownloadSummary",
 ];
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 const Cr = Components.results;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "Promise",
                                   "resource://gre/modules/Promise.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Task",
                                   "resource://gre/modules/Task.jsm");
 
-////////////////////////////////////////////////////////////////////////////////
-//// DownloadList
+// //////////////////////////////////////////////////////////////////////////////
+// // DownloadList
 
 /**
  * Represents a collection of Download objects that can be viewed and managed by
  * the user interface, and persisted across sessions.
  */
 this.DownloadList = function ()
 {
   this._downloads = [];
@@ -250,18 +250,18 @@ this.DownloadList.prototype = {
           // processing the other downloads in the list.
           download.finalize(true).then(null, Cu.reportError);
         }
       }
     }.bind(this)).then(null, Cu.reportError);
   },
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// DownloadCombinedList
+// //////////////////////////////////////////////////////////////////////////////
+// // DownloadCombinedList
 
 /**
  * Provides a unified, unordered list combining public and private downloads.
  *
  * Download objects added to this list are also added to one of the two
  * underlying lists, based on their "source.isPrivate" property.  Views on this
  * list will receive notifications for both public and private downloads.
  *
@@ -335,18 +335,18 @@ this.DownloadCombinedList.prototype = {
   remove: function (aDownload)
   {
     if (aDownload.source.isPrivate) {
       return this._privateList.remove(aDownload);
     }
     return this._publicList.remove(aDownload);
   },
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// DownloadList view
+  // ////////////////////////////////////////////////////////////////////////////
+  // // DownloadList view
 
   onDownloadAdded: function (aDownload)
   {
     this._downloads.push(aDownload);
     this._notifyAllViews("onDownloadAdded", aDownload);
   },
 
   onDownloadChanged: function (aDownload)
@@ -359,18 +359,18 @@ this.DownloadCombinedList.prototype = {
     let index = this._downloads.indexOf(aDownload);
     if (index != -1) {
       this._downloads.splice(index, 1);
     }
     this._notifyAllViews("onDownloadRemoved", aDownload);
   },
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// DownloadSummary
+// //////////////////////////////////////////////////////////////////////////////
+// // DownloadSummary
 
 /**
  * Provides an aggregated view on the contents of a DownloadList.
  */
 this.DownloadSummary = function ()
 {
   this._downloads = [];
   this._views = new Set();
@@ -533,18 +533,18 @@ this.DownloadSummary.prototype = {
           view.onSummaryChanged();
         }
       } catch (ex) {
         Cu.reportError(ex);
       }
     }
   },
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// DownloadList view
+  // ////////////////////////////////////////////////////////////////////////////
+  // // DownloadList view
 
   onDownloadAdded: function (aDownload)
   {
     this._downloads.push(aDownload);
     if (this._list) {
       this._onListChanged();
     }
   },
--- a/toolkit/components/jsdownloads/src/DownloadStore.jsm
+++ b/toolkit/components/jsdownloads/src/DownloadStore.jsm
@@ -29,18 +29,18 @@
  */
 
 "use strict";
 
 this.EXPORTED_SYMBOLS = [
   "DownloadStore",
 ];
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 const Cr = Components.results;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
@@ -54,18 +54,18 @@ XPCOMUtils.defineLazyModuleGetter(this, 
 XPCOMUtils.defineLazyGetter(this, "gTextDecoder", function () {
   return new TextDecoder();
 });
 
 XPCOMUtils.defineLazyGetter(this, "gTextEncoder", function () {
   return new TextEncoder();
 });
 
-////////////////////////////////////////////////////////////////////////////////
-//// DownloadStore
+// //////////////////////////////////////////////////////////////////////////////
+// // DownloadStore
 
 /**
  * Handles serialization of Download objects and persistence into a file, so
  * that the state of downloads can be restored across sessions.
  *
  * @param aList
  *        DownloadList object to be populated or serialized.
  * @param aPath
--- a/toolkit/components/jsdownloads/src/DownloadUIHelper.jsm
+++ b/toolkit/components/jsdownloads/src/DownloadUIHelper.jsm
@@ -9,18 +9,18 @@
  */
 
 "use strict";
 
 this.EXPORTED_SYMBOLS = [
   "DownloadUIHelper",
 ];
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 const Cr = Components.results;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/AppConstants.jsm");
@@ -39,18 +39,18 @@ const kStringsRequiringFormatting = {
   fileExecutableSecurityWarning: true,
   cancelDownloadsOKTextMultiple: true,
   quitCancelDownloadsAlertMsgMultiple: true,
   quitCancelDownloadsAlertMsgMacMultiple: true,
   offlineCancelDownloadsAlertMsgMultiple: true,
   leavePrivateBrowsingWindowsCancelDownloadsAlertMsgMultiple2: true
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// DownloadUIHelper
+// //////////////////////////////////////////////////////////////////////////////
+// // DownloadUIHelper
 
 /**
  * Provides functions to handle status and messages in the user interface.
  */
 this.DownloadUIHelper = {
   /**
    * Returns an object that can be used to display prompts related to downloads.
    *
@@ -92,18 +92,18 @@ XPCOMUtils.defineLazyGetter(DownloadUIHe
       };
     } else {
       strings[stringName] = string.value;
     }
   }
   return strings;
 });
 
-////////////////////////////////////////////////////////////////////////////////
-//// DownloadPrompter
+// //////////////////////////////////////////////////////////////////////////////
+// // DownloadPrompter
 
 /**
  * Allows displaying prompts related to downloads.
  *
  * @param aParent
  *        The nsIDOMWindow to which prompts should be attached, or null to
  *        attach prompts to the most recently active window.
  */
--- a/toolkit/components/jsdownloads/src/Downloads.jsm
+++ b/toolkit/components/jsdownloads/src/Downloads.jsm
@@ -9,18 +9,18 @@
  */
 
 "use strict";
 
 this.EXPORTED_SYMBOLS = [
   "Downloads",
 ];
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 const Cr = Components.results;
 
 Cu.import("resource://gre/modules/Integration.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
@@ -37,18 +37,18 @@ XPCOMUtils.defineLazyModuleGetter(this, 
 XPCOMUtils.defineLazyModuleGetter(this, "Promise",
                                   "resource://gre/modules/Promise.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Task",
                                   "resource://gre/modules/Task.jsm");
 
 Integration.downloads.defineModuleGetter(this, "DownloadIntegration",
             "resource://gre/modules/DownloadIntegration.jsm");
 
-////////////////////////////////////////////////////////////////////////////////
-//// Downloads
+// //////////////////////////////////////////////////////////////////////////////
+// // Downloads
 
 /**
  * This object is exposed directly to the consumers of this JavaScript module,
  * and provides the only entry point to get references to back-end objects.
  */
 this.Downloads = {
   /**
    * Work on downloads that were not started from a private browsing window.
--- a/toolkit/components/jsdownloads/test/browser/head.js
+++ b/toolkit/components/jsdownloads/test/browser/head.js
@@ -4,18 +4,18 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Provides infrastructure for automated download components tests.
  */
 
 "use strict";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
 var Cr = Components.results;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
@@ -29,18 +29,18 @@ XPCOMUtils.defineLazyModuleGetter(this, 
                                   "resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "HttpServer",
                                   "resource://testing-common/httpd.js");
 XPCOMUtils.defineLazyModuleGetter(this, "OS",
                                   "resource://gre/modules/osfile.jsm");
 
 const TEST_TARGET_FILE_NAME_PDF = "test-download.pdf";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Support functions
+// //////////////////////////////////////////////////////////////////////////////
+// // Support functions
 
 // While the previous test file should have deleted all the temporary files it
 // used, on Windows these might still be pending deletion on the physical file
 // system.  Thus, start from a new base number every time, to make a collision
 // with a file that is still pending deletion highly unlikely.
 var gFileCounter = Math.floor(Math.random() * 1000000);
 
 /**
--- a/toolkit/components/jsdownloads/test/unit/common_test_Download.js
+++ b/toolkit/components/jsdownloads/test/unit/common_test_Download.js
@@ -6,18 +6,18 @@
 /**
  * This script is loaded by "test_DownloadCore.js" and "test_DownloadLegacy.js"
  * with different values of the gUseLegacySaver variable, to apply tests to both
  * the "copy" and "legacy" saver implementations.
  */
 
 "use strict";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 const kDeleteTempFileOnExit = "browser.helperApps.deleteTempFileOnExit";
 
 /**
  * Creates and starts a new download, using either DownloadCopySaver or
  * DownloadLegacySaver based on the current test run.
  *
  * @return {Promise}
@@ -164,18 +164,18 @@ function waitForDirectoryShown() {
         resolve(path);
         return Promise.resolve();
       },
     });
     Integration.downloads.register(waitFn);
   });
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Tests
+// //////////////////////////////////////////////////////////////////////////////
+// // Tests
 
 /**
  * Executes a download and checks its basic properties after construction.
  * The download is started by constructing the simplest Download object with
  * the "copy" saver, or using the legacy nsITransfer interface.
  */
 add_task(function* test_basic()
 {
--- a/toolkit/components/jsdownloads/test/unit/head.js
+++ b/toolkit/components/jsdownloads/test/unit/head.js
@@ -4,18 +4,18 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Provides infrastructure for automated download components tests.
  */
 
 "use strict";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
 var Cr = Components.results;
 
 Cu.import("resource://gre/modules/Integration.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
@@ -85,18 +85,18 @@ const TEST_DATA_SHORT_GZIP_ENCODED =
  * All the tests are implemented with add_task, this starts them automatically.
  */
 function run_test()
 {
   do_get_profile();
   run_next_test();
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Support functions
+// //////////////////////////////////////////////////////////////////////////////
+// // Support functions
 
 /**
  * HttpServer object initialized before tests start.
  */
 var gHttpServer;
 
 /**
  * Given a file name, returns a string containing an URI that points to the file
@@ -671,18 +671,18 @@ function isValidDate(aDate) {
 }
 
 /**
  * Position of the first byte served by the "interruptible_resumable.txt"
  * handler during the most recent response.
  */
 var gMostRecentFirstBytePos;
 
-////////////////////////////////////////////////////////////////////////////////
-//// Initialization functions common to all tests
+// //////////////////////////////////////////////////////////////////////////////
+// // Initialization functions common to all tests
 
 add_task(function test_common_initialize()
 {
   // Start the HTTP server.
   gHttpServer = new HttpServer();
   gHttpServer.registerDirectory("/", do_get_file("../data"));
   gHttpServer.start(-1);
   do_register_cleanup(() => {
--- a/toolkit/components/jsdownloads/test/unit/test_DownloadCore.js
+++ b/toolkit/components/jsdownloads/test/unit/test_DownloadCore.js
@@ -7,26 +7,26 @@
  * Tests the main download interfaces using DownloadCopySaver.
  */
 
 "use strict";
 
 XPCOMUtils.defineLazyModuleGetter(this, "DownloadError",
                                   "resource://gre/modules/DownloadCore.jsm");
 
-////////////////////////////////////////////////////////////////////////////////
-//// Execution of common tests
+// //////////////////////////////////////////////////////////////////////////////
+// // Execution of common tests
 
 var gUseLegacySaver = false;
 
 var scriptFile = do_get_file("common_test_Download.js");
 Services.scriptloader.loadSubScript(NetUtil.newURI(scriptFile).spec);
 
-////////////////////////////////////////////////////////////////////////////////
-//// Tests
+// //////////////////////////////////////////////////////////////////////////////
+// // Tests
 
 /**
  * Tests the DownloadError object.
  */
 add_task(function test_DownloadError()
 {
   let error = new DownloadError({ result: Cr.NS_ERROR_NOT_RESUMABLE,
                                   message: "Not resumable."});
--- a/toolkit/components/jsdownloads/test/unit/test_DownloadImport.js
+++ b/toolkit/components/jsdownloads/test/unit/test_DownloadImport.js
@@ -2,18 +2,18 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Tests the DownloadImport object.
  */
 
 "use strict";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 XPCOMUtils.defineLazyModuleGetter(this, "Sqlite",
                                   "resource://gre/modules/Sqlite.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "DownloadImport",
                                   "resource://gre/modules/DownloadImport.jsm");
 
 // Importable states
 const DOWNLOAD_NOTSTARTED = -1;
@@ -121,20 +121,20 @@ function promiseInsertRow(aConnection, a
   ];
 
   return aConnection.execute("INSERT INTO moz_downloads ("
                             + "name, source, target, tempPath, startTime,"
                             + "endTime, state, referrer, entityID, currBytes,"
                             + "maxBytes, mimeType, preferredApplication,"
                             + "preferredAction, autoResume, guid)"
                             + "VALUES ("
-                            + "'', ?, ?, ?, ?, " //name,
-                            + "0, ?, ?, ?, 0, "  //endTime, currBytes
+                            + "'', ?, ?, ?, ?, " // name,
+                            + "0, ?, ?, ?, 0, "  // endTime, currBytes
                             + " ?, ?, ?, "       //
-                            + " ?, ?, '')",      //and guid are not imported
+                            + " ?, ?, '')",      // and guid are not imported
                             values);
 }
 
 /**
  * Retrieves the number of rows in the moz_downloads table of the
  * database.
  *
  * @param aConnection
@@ -317,18 +317,18 @@ function checkDownload(aDownload, aDownl
     do_check_eq(aDownload.contentType, aDownloadRow.expectedContentType);
     do_check_eq(aDownload.launcherPath, aDownloadRow.preferredApplication);
 
     do_check_eq(aDownload.launchWhenSucceeded,
                 aDownloadRow.preferredAction != Ci.nsIMIMEInfo.saveToDisk);
   });
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Preparation tasks
+// //////////////////////////////////////////////////////////////////////////////
+// // Preparation tasks
 
 /**
  * Prepares the list of downloads to be added to the database that should
  * be imported by the import procedure.
  */
 add_task(function* prepareDownloadsToImport() {
 
   let sourceUrl = httpUrl("source.txt");
@@ -647,18 +647,18 @@ add_task(function* prepareNonImportableD
       mimeType: "mimeType7",
       preferredAction: Ci.nsIMIMEInfo.saveToDisk,
       preferredApplication: "prerredApplication7",
       autoResume: 1
     },
   ];
 });
 
-////////////////////////////////////////////////////////////////////////////////
-//// Test
+// //////////////////////////////////////////////////////////////////////////////
+// // Test
 
 /**
  * Creates a temporary Sqlite database with download data and perform an
  * import of that data to the new Downloads API to verify that the import
  * worked correctly.
  */
 add_task(function* test_downloadImport()
 {
--- a/toolkit/components/jsdownloads/test/unit/test_DownloadIntegration.js
+++ b/toolkit/components/jsdownloads/test/unit/test_DownloadIntegration.js
@@ -2,18 +2,18 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Tests the DownloadIntegration object.
  */
 
 "use strict";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 /**
  * Notifies the prompt observers and verify the expected downloads count.
  *
  * @param aIsPrivate
  *        Flag to know is test private observers.
  * @param aExpectedCount
  *        the expected downloads count for quit and offline observers.
@@ -39,18 +39,18 @@ function notifyPromptObservers(aIsPrivat
     DownloadIntegration._testPromptDownloads = -1;
     Services.obs.notifyObservers(cancelQuit, "last-pb-context-exiting", null);
     do_check_eq(DownloadIntegration._testPromptDownloads, aExpectedPBCount);
   }
 
   delete DownloadIntegration._testPromptDownloads;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Tests
+// //////////////////////////////////////////////////////////////////////////////
+// // Tests
 
 /**
  * Allows re-enabling the real download directory logic during one test.
  */
 function allowDirectoriesInTest() {
   DownloadIntegration.allowDirectories = true;
   function cleanup() {
     DownloadIntegration.allowDirectories = false;
@@ -201,18 +201,18 @@ add_task(function* test_getTemporaryDown
   } else {
     let tempDir = Services.dirsvc.get("TmpD", Ci.nsIFile);
     do_check_eq(downloadDir, tempDir.path);
   }
 
   cleanup();
 });
 
-////////////////////////////////////////////////////////////////////////////////
-//// Tests DownloadObserver
+// //////////////////////////////////////////////////////////////////////////////
+// // Tests DownloadObserver
 
 /**
  * Re-enables the default observers for the following tests.
  *
  * This takes effect the first time a DownloadList object is created, and lasts
  * until this test file has completed.
  */
 add_task(function* test_observers_setup()
--- a/toolkit/components/jsdownloads/test/unit/test_DownloadLegacy.js
+++ b/toolkit/components/jsdownloads/test/unit/test_DownloadLegacy.js
@@ -4,15 +4,15 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Tests the integration with legacy interfaces for downloads.
  */
 
 "use strict";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Execution of common tests
+// //////////////////////////////////////////////////////////////////////////////
+// // Execution of common tests
 
 var gUseLegacySaver = true;
 
 var scriptFile = do_get_file("common_test_Download.js");
 Services.scriptloader.loadSubScript(NetUtil.newURI(scriptFile).spec);
--- a/toolkit/components/jsdownloads/test/unit/test_DownloadList.js
+++ b/toolkit/components/jsdownloads/test/unit/test_DownloadList.js
@@ -4,18 +4,18 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Tests the DownloadList object.
  */
 
 "use strict";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 /**
  * Returns a PRTime in the past usable to add expirable visits.
  *
  * @note Expiration ignores any visit added in the last 7 days, but it's
  *       better be safe against DST issues, by going back one day more.
  */
 function getExpirablePRTime()
@@ -60,18 +60,18 @@ function promiseExpirableDownloadVisit(a
       handleResult: function () {},
       handleCompletion: function handleCompletion() {
         deferred.resolve();
       }
     });
   return deferred.promise;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Tests
+// //////////////////////////////////////////////////////////////////////////////
+// // Tests
 
 /**
  * Checks the testing mechanism used to build different download lists.
  */
 add_task(function* test_construction()
 {
   let downloadListOne = yield promiseNewList();
   let downloadListTwo = yield promiseNewList();
--- a/toolkit/components/jsdownloads/test/unit/test_DownloadStore.js
+++ b/toolkit/components/jsdownloads/test/unit/test_DownloadStore.js
@@ -4,18 +4,18 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Tests the DownloadStore object.
  */
 
 "use strict";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 XPCOMUtils.defineLazyModuleGetter(this, "DownloadStore",
                                   "resource://gre/modules/DownloadStore.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "OS",
                                   "resource://gre/modules/osfile.jsm")
 
 /**
  * Returns a new DownloadList object with an associated DownloadStore.
@@ -33,18 +33,18 @@ function promiseNewListAndStore(aStorePa
 {
   return promiseNewList().then(function (aList) {
     let path = aStorePath || getTempFile(TEST_STORE_FILE_NAME).path;
     let store = new DownloadStore(aList, path);
     return [aList, store];
   });
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Tests
+// //////////////////////////////////////////////////////////////////////////////
+// // Tests
 
 /**
  * Saves downloads to a file, then reloads them.
  */
 add_task(function* test_save_reload()
 {
   let [listForSave, storeForSave] = yield promiseNewListAndStore();
   let [listForLoad, storeForLoad] = yield promiseNewListAndStore(
--- a/toolkit/components/jsdownloads/test/unit/test_Downloads.js
+++ b/toolkit/components/jsdownloads/test/unit/test_Downloads.js
@@ -4,18 +4,18 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Tests the functions located directly in the "Downloads" object.
  */
 
 "use strict";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Tests
+// //////////////////////////////////////////////////////////////////////////////
+// // Tests
 
 /**
  * Tests that the createDownload function exists and can be called.  More
  * detailed tests are implemented separately for the DownloadCore module.
  */
 add_task(function* test_createDownload()
 {
   // Creates a simple Download object without starting the download.
--- a/toolkit/components/lz4/lz4_internal.js
+++ b/toolkit/components/lz4/lz4_internal.js
@@ -24,38 +24,38 @@ if (typeof Components != "undefined") {
 }
 
 var libxul = new SharedAll.Library("libxul", SharedAll.Constants.Path.libxul);
 var Type = SharedAll.Type;
 
 libxul.declareLazyFFI(Primitives, "compress",
   "workerlz4_compress",
   null,
-  /*return*/ Type.size_t,
-  /*const source*/ Type.void_t.in_ptr,
-  /*inputSize*/ Type.size_t,
-  /*dest*/ Type.void_t.out_ptr
+  /* return*/ Type.size_t,
+  /* const source*/ Type.void_t.in_ptr,
+  /* inputSize*/ Type.size_t,
+  /* dest*/ Type.void_t.out_ptr
 );
 
 libxul.declareLazyFFI(Primitives, "decompress",
   "workerlz4_decompress",
   null,
-  /*return*/ Type.int,
-  /*const source*/ Type.void_t.in_ptr,
-  /*inputSize*/ Type.size_t,
-  /*dest*/ Type.void_t.out_ptr,
-  /*maxOutputSize*/ Type.size_t,
-  /*actualOutputSize*/ Type.size_t.out_ptr
+  /* return*/ Type.int,
+  /* const source*/ Type.void_t.in_ptr,
+  /* inputSize*/ Type.size_t,
+  /* dest*/ Type.void_t.out_ptr,
+  /* maxOutputSize*/ Type.size_t,
+  /* actualOutputSize*/ Type.size_t.out_ptr
 );
 
 libxul.declareLazyFFI(Primitives, "maxCompressedSize",
   "workerlz4_maxCompressedSize",
   null,
-  /*return*/ Type.size_t,
-  /*inputSize*/ Type.size_t
+  /* return*/ Type.size_t,
+  /* inputSize*/ Type.size_t
 );
 
 if (typeof module != "undefined") {
   module.exports = {
     get compress() {
       return Primitives.compress;
     },
     get decompress() {
--- a/toolkit/components/lz4/tests/xpcshell/data/worker_lz4.js
+++ b/toolkit/components/lz4/tests/xpcshell/data/worker_lz4.js
@@ -1,14 +1,14 @@
 importScripts("resource://gre/modules/workers/require.js");
 importScripts("resource://gre/modules/osfile.jsm");
 
 
 function do_print(x) {
-  //self.postMessage({kind: "do_print", args: [x]});
+  // self.postMessage({kind: "do_print", args: [x]});
   dump("TEST-INFO: " + x + "\n");
 }
 
 function do_check_true(x) {
   self.postMessage({kind: "do_check_true", args: [!!x]});
   if (x) {
     dump("TEST-PASS: " + x + "\n");
   } else {
--- a/toolkit/components/microformats/microformat-shiv.js
+++ b/toolkit/components/microformats/microformat-shiv.js
@@ -1202,17 +1202,17 @@ var Microformats; // jshint ignore:line
                                                         v2Name = context.getV2RootName(items[y]);
                                                         // add new root
                                                         if (prop.uf.indexOf(v2Name) > -1 && out.root.indexOf(v2Name) === -1) {
                                                             out.root.push(v2Name);
                                                             out.typeVersion = 'v1';
                                                         }
                                                         y++;
                                                     }
-                                                    //only add property once
+                                                    // only add property once
                                                     if (out.properties.indexOf(propName) === -1) {
                                                         out.properties.push([propName, 'v1']);
                                                     }
                                                 } else if (out.properties.indexOf(propName) === -1) {
                                                     out.properties.push([propName, 'v1']);
                                                 }
                                             }
                                         }
@@ -1237,21 +1237,21 @@ var Microformats; // jshint ignore:line
                     impiedRel = this.findRelImpied(node, ufName);
                     if (impiedRel && out.properties.indexOf(impiedRel) === -1) {
                         out.properties.push([impiedRel, 'v1']);
                     }
                 }
             }
 
 
-            //if(out.root.length === 1 && out.properties.length === 1) {
+            // if(out.root.length === 1 && out.properties.length === 1) {
             //  if(out.root[0].replace('h-','') === this.removePropPrefix(out.properties[0][0])) {
             //      out.typeVersion = 'v2';
             //  }
-            //}
+            // }
 
             return out;
         },
 
 
         /**
          * given a v1 or v2 root name, return mapping object
          *
@@ -1381,17 +1381,17 @@ var Microformats; // jshint ignore:line
 
             nodes = modules.domUtils.getNodesByAttribute(node, attrName);
             i = nodes.length;
             while (i--) {
                 try {
                     // the url parser can blow up if the format is not right
                     attr = modules.domUtils.getAttribute(nodes[i], attrName);
                     if (attr && attr !== '' && baseUrl !== '' && attr.indexOf('://') === -1) {
-                        //attr = urlParser.resolve(baseUrl, attr);
+                        // attr = urlParser.resolve(baseUrl, attr);
                         attr = modules.url.resolve(attr, baseUrl);
                         modules.domUtils.setAttribute(nodes[i], attrName, attr);
                     }
                 } catch (err) {
                     // do nothing - convert only the urls we can, leave the rest as they are
                 }
             }
         },
@@ -2420,17 +2420,17 @@ var Microformats; // jshint ignore:line
             // if a node is passed
             if (options.node) {
                 this.rootNode = options.node;
             }
 
 
             // if a html string is passed
             if (options.html) {
-                //var domParser = new DOMParser();
+                // var domParser = new DOMParser();
                 var domParser = this.getDOMParser();
                 this.rootNode = domParser.parseFromString( options.html, 'text/html' );
             }
 
 
             // find top level document from rootnode
             if (this.rootNode !== null) {
                 if (this.rootNode.nodeType === 9) {
@@ -2461,20 +2461,20 @@ var Microformats; // jshint ignore:line
 
         /**
         * gets the first DOM node
         *
         * @param  {Dom Document}
         * @return {DOM Node} node
         */
         getTopMostNode: function( node ) {
-            //var doc = this.ownerDocument(node);
-            //if(doc && doc.nodeType && doc.nodeType === 9 && doc.documentElement){
+            // var doc = this.ownerDocument(node);
+            // if(doc && doc.nodeType && doc.nodeType === 9 && doc.documentElement){
             //  return doc.documentElement;
-            //}
+            // }
             return node;
         },
 
 
 
          /**
          * abstracts DOM ownerDocument
          *
@@ -2837,17 +2837,17 @@ var Microformats; // jshint ignore:line
         /**
          * decodes html entities in given text
          *
          * @param  {DOM Document} doc
          * @param  String} text
          * @return {String}
          */
         decodeEntities: function( doc, text ) {
-            //return text;
+            // return text;
             return doc.createTextNode( text ).nodeValue;
         },
 
 
         /**
          * clones a DOM document
          *
          * @param  {DOM Document} document
@@ -2976,17 +2976,17 @@ var Microformats; // jshint ignore:line
 
     modules.url = {
 
 
         /**
          * creates DOM objects needed to resolve URLs
          */
         init: function() {
-            //this._domParser = new DOMParser();
+            // this._domParser = new DOMParser();
             this._domParser = modules.domUtils.getDOMParser();
             // do not use a head tag it does not work with IE9
             this._html = '<base id="base" href=""></base><a id="link" href=""></a>';
             this._nodes = this._domParser.parseFromString( this._html, 'text/html' );
             this._baseNode =  modules.domUtils.getElementById(this._nodes, 'base');
             this._linkNode =  modules.domUtils.getElementById(this._nodes, 'link');
         },
 
@@ -3593,17 +3593,17 @@ var Microformats; // jshint ignore:line
          * @return {String}
          */
         parseAmPmTime: function( text ) {
             var out = text,
                 times = [];
 
             // if the string has a text : or am or pm
             if (modules.utils.isString(out)) {
-                //text = text.toLowerCase();
+                // text = text.toLowerCase();
                 text = text.replace(/[ ]+/g, '');
 
                 if (text.match(':') || this.hasAM(text) || this.hasPM(text)) {
 
                     if (text.match(':')) {
                         times = text.split(':');
                     } else {
                         // single number text i.e. 5pm
@@ -3803,17 +3803,17 @@ var Microformats; // jshint ignore:line
               var out = '',
                   regex = /(<([^>]+)>)/ig;
 
               out = text.replace(regex, '');
               if (this.textFormat === 'whitespacetrimmed') {
                  out = modules.utils.trimWhitespace( out );
               }
 
-              //return entities.decode( out, 2 );
+              // return entities.decode( out, 2 );
               return modules.domUtils.decodeEntities( doc, out );
            }
            return '';
         },
 
 
         /**
          * normalises whitespace in given text
--- a/toolkit/components/microformats/update/update.js
+++ b/toolkit/components/microformats/update/update.js
@@ -1,9 +1,9 @@
-/*!
+/* !
 	update.js
 
 	run $ npm install
 	run $ node unpdate.js
 
 	Downloads latest version of microformat-shiv and it tests form github repo
 	Files downloaded:
 	* microformat-shiv.js (note: modern version)
--- a/toolkit/components/passwordmgr/LoginHelper.jsm
+++ b/toolkit/components/passwordmgr/LoginHelper.jsm
@@ -11,26 +11,26 @@
  */
 
 "use strict";
 
 this.EXPORTED_SYMBOLS = [
   "LoginHelper",
 ];
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
-////////////////////////////////////////////////////////////////////////////////
-//// LoginHelper
+// //////////////////////////////////////////////////////////////////////////////
+// // LoginHelper
 
 /**
  * Contains functions shared by different Login Manager components.
  */
 this.LoginHelper = {
   /**
    * Warning: these only update if a logger was created.
    */
--- a/toolkit/components/passwordmgr/LoginImport.jsm
+++ b/toolkit/components/passwordmgr/LoginImport.jsm
@@ -10,36 +10,36 @@
  */
 
 "use strict";
 
 this.EXPORTED_SYMBOLS = [
   "LoginImport",
 ];
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 const Cr = Components.results;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "OS",
                                   "resource://gre/modules/osfile.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Sqlite",
                                   "resource://gre/modules/Sqlite.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
                                   "resource://gre/modules/NetUtil.jsm");
 
-////////////////////////////////////////////////////////////////////////////////
-//// LoginImport
+// //////////////////////////////////////////////////////////////////////////////
+// // LoginImport
 
 /**
  * Provides an object that has a method to import login-related data from the
  * previous SQLite storage format.
  *
  * @param aStore
  *        LoginStore object where imported data will be added.
  * @param aPath
--- a/toolkit/components/passwordmgr/LoginStore.jsm
+++ b/toolkit/components/passwordmgr/LoginStore.jsm
@@ -41,18 +41,18 @@
  */
 
 "use strict";
 
 this.EXPORTED_SYMBOLS = [
   "LoginStore",
 ];
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "JSONFile",
                                   "resource://gre/modules/JSONFile.jsm");
@@ -68,18 +68,18 @@ XPCOMUtils.defineLazyModuleGetter(this, 
  * For example, this number should NOT be changed when a new optional field is
  * added to a login entry.
  */
 const kDataVersion = 2;
 
 // The permission type we store in the permission manager.
 const PERMISSION_SAVE_LOGINS = "login-saving";
 
-////////////////////////////////////////////////////////////////////////////////
-//// LoginStore
+// //////////////////////////////////////////////////////////////////////////////
+// // LoginStore
 
 /**
  * Inherits from JSONFile and handles serialization of login-related data and
  * persistence into a file.
  *
  * @param aPath
  *        String containing the file path where data should be saved.
  */
--- a/toolkit/components/passwordmgr/content/passwordManager.js
+++ b/toolkit/components/passwordmgr/content/passwordManager.js
@@ -1,13 +1,13 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/*** =================== SAVED SIGNONS CODE =================== ***/
+/** * =================== SAVED SIGNONS CODE =================== ***/
 const { classes: Cc, interfaces: Ci, results: Cr, utils: Cu } = Components;
 
 Cu.import("resource://gre/modules/AppConstants.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "DeferredTask",
                                   "resource://gre/modules/DeferredTask.jsm");
--- a/toolkit/components/passwordmgr/nsLoginManager.js
+++ b/toolkit/components/passwordmgr/nsLoginManager.js
@@ -7,17 +7,17 @@
 const { classes: Cc, interfaces: Ci, results: Cr, utils: Cu } = Components;
 
 const PERMISSION_SAVE_LOGINS = "login-saving";
 
 Cu.import("resource://gre/modules/AppConstants.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Timer.jsm");
-Cu.import("resource://gre/modules/LoginManagerContent.jsm"); /*global UserAutoCompleteResult */
+Cu.import("resource://gre/modules/LoginManagerContent.jsm"); /* global UserAutoCompleteResult */
 
 XPCOMUtils.defineLazyModuleGetter(this, "Promise",
                                   "resource://gre/modules/Promise.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Task",
                                   "resource://gre/modules/Task.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "BrowserUtils",
                                   "resource://gre/modules/BrowserUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "LoginHelper",
--- a/toolkit/components/passwordmgr/storage-mozStorage.js
+++ b/toolkit/components/passwordmgr/storage-mozStorage.js
@@ -796,17 +796,17 @@ LoginManagerStorage_mozStorage.prototype
       }
       result.push(login);
     }
 
     return result;
   },
 
 
-  //**************************************************************************//
+  //* *************************************************************************//
   // Database Creation & Access
 
   /**
    * Creates a statement, wraps it, and then does parameter replacement
    * Returns the wrapped statement for execution.  Will use memoization
    * so that statements can be reused.
    */
   _dbCreateStatement : function (query, params) {
--- a/toolkit/components/passwordmgr/test/browser/browser_username_select_dialog.js
+++ b/toolkit/components/passwordmgr/test/browser/browser_username_select_dialog.js
@@ -4,17 +4,17 @@
  */
 
 // Copied from prompt_common.js. TODO: share the code.
 function getSelectDialogDoc() {
   // Trudge through all the open windows, until we find the one
   // that has selectDialog.xul loaded.
   var wm = Cc["@mozilla.org/appshell/window-mediator;1"].
            getService(Ci.nsIWindowMediator);
-  //var enumerator = wm.getEnumerator("navigator:browser");
+  // var enumerator = wm.getEnumerator("navigator:browser");
   var enumerator = wm.getXULWindowEnumerator(null);
 
   while (enumerator.hasMoreElements()) {
     var win = enumerator.getNext();
     var windowDocShell = win.QueryInterface(Ci.nsIXULWindow).docShell;
 
     var containedDocShells = windowDocShell.getDocShellEnumerator(
                                       Ci.nsIDocShellTreeItem.typeChrome,
--- a/toolkit/components/passwordmgr/test/browser/subtst_notifications_5.html
+++ b/toolkit/components/passwordmgr/test/browser/subtst_notifications_5.html
@@ -9,20 +9,18 @@
 <form id="form" action="formsubmit.sjs">
   <input id="user" name="user">
   <button type='submit'>Submit</button>
 </form>
 
 <script>
 function submitForm() {
   userField.value = "notifyu1";
-  //passField.value = "notifyp1";
   form.submit();
 }
 
 window.onload = submitForm;
 var form      = document.getElementById("form");
 var userField = document.getElementById("user");
-//var passField = document.getElementById("pass");
 
 </script>
 </body>
 </html>
--- a/toolkit/components/passwordmgr/test/browser/subtst_notifications_6.html
+++ b/toolkit/components/passwordmgr/test/browser/subtst_notifications_6.html
@@ -9,21 +9,19 @@
 (password-only form)
 <form id="form" action="formsubmit.sjs">
   <input id="pass" name="pass" type="password">
   <button type='submit'>Submit</button>
 </form>
 
 <script>
 function submitForm() {
-  //userField.value = "notifyu1";
   passField.value = "notifyp1";
   form.submit();
 }
 
 window.onload = submitForm;
 var form      = document.getElementById("form");
-//var userField = document.getElementById("user");
 var passField = document.getElementById("pass");
 
 </script>
 </body>
 </html>
--- a/toolkit/components/passwordmgr/test/mochitest/test_basic_form_2pw_2.html
+++ b/toolkit/components/passwordmgr/test/mochitest/test_basic_form_2pw_2.html
@@ -36,17 +36,16 @@ function startTest() {
 
   // Fill in the username and password fields, for account creation.
   // Form 1
   $_(1, "uname").value = "newuser1";
   $_(1, "pword").value = "newpass1";
   $_(1, "qword").value = "newpass1";
 
   var button = getFormSubmitButton(1);
-  //button.click();
 
   todo(false, "form submission disabled, can't auto-accept dialog yet");
   SimpleTest.finish();
 }
 
 
 // Called by each form's onsubmit handler.
 function checkSubmit(formNum) {
--- a/toolkit/components/passwordmgr/test/mochitest/test_basic_form_autocomplete.html
+++ b/toolkit/components/passwordmgr/test/mochitest/test_basic_form_autocomplete.html
@@ -531,17 +531,16 @@ add_task(function* test_form1_check_only
   let shownPromise = promiseACShown();
   doKey("down"); // open
   yield shownPromise;
 
   /* test 56 */
   // Delete the only remaining entry, "testuser2"
   doKey("down");
   doKey("delete", shiftModifier);
-  //doKey("return");
   checkACForm("", "");
   numLogins = LoginManager.countLogins("http://mochi.test:8888", "http://autocomplete:8888", null);
   is(numLogins, 1, "Correct number of logins after deleting one");
 
   // remove the login that's not shown in the list.
   setupScript.sendSyncMessage("removeLogin", "login0");
 });
 
--- a/toolkit/components/passwordmgr/test/mochitest/test_bug_627616.html
+++ b/toolkit/components/passwordmgr/test/mochitest/test_bug_627616.html
@@ -102,17 +102,16 @@
           Services.logins.addLogin(login);
 
           let login2 = Cc["@mozilla.org/login-manager/loginInfo;1"].
                        createInstance(Ci.nsILoginInfo);
           login2.init("http://mochi.test:8888", null, "mochirealm", "user1name",
                        "user1pass", "", "");
           Services.logins.addLogin(login2);
 
-          //startWatchingForPrompts();
           sendAsyncMessage("setupDone");
         },
         QueryInterface: XPCOMUtils.generateQI([Ci.nsIProtocolProxyCallback]),
       });
 
       addMessageListener("prepareForNextTest", message => {
         Cc["@mozilla.org/network/http-auth-manager;1"].
           getService(Ci.nsIHttpAuthManager).
--- a/toolkit/components/passwordmgr/test/mochitest/test_form_action_2.html
+++ b/toolkit/components/passwordmgr/test/mochitest/test_form_action_2.html
@@ -141,26 +141,22 @@ function startTest() {
     is($_(i, "pword").value, "", "Checking for unfilled password " + i);
   }
 
   is($_(9, "uname").value, "testuser", "Checking for unmodified username 9");
   is($_(9, "pword").value, "",         "Checking for unfilled password 9");
 
   is($_("10-A", "uname").value, "", "Checking for unfilled username 10A");
   is($_("10-A", "pword").value, "", "Checking for unfilled password 10A");
-  //is($_("10-B", "uname").value, "", "Checking for unfilled username 10B");
-  //is($_("10-B", "pword").value, "", "Checking for unfilled password 10B");
 
   // The DOM indicates this form could be filled, as the evil inner form
   // is discarded. And yet pwmgr seems not to fill it. Not sure why.
   todo(false, "Mangled form combo not being filled when maybe it could be?");
   is($_("11-A", "uname").value, "testuser", "Checking filled username 11A");
   is($_("11-A", "pword").value, "testpass", "Checking filled password 11A");
-  //is($_("11-B", "uname").value, "", "Checking for unfilled username 11B");
-  //is($_("11-B", "pword").value, "", "Checking for unfilled password 11B");
 
   // Verify this by making sure there are no extra forms in the document, and
   // that the submit button for the neutered forms don't do anything.
   // If the test finds extra forms the submit() causes the test to timeout, then
   // there may be a security issue.
   is(document.forms.length,  11,  "Checking for unexpected forms");
   $("neutered_submit10").click();
   $("neutered_submit11").click();
--- a/toolkit/components/passwordmgr/test/mochitest/test_prompt_promptAuth_proxy.html
+++ b/toolkit/components/passwordmgr/test/mochitest/test_prompt_promptAuth_proxy.html
@@ -110,17 +110,17 @@ var resolveCallback = SpecialPowers.wrap
                                          null,      // aTriggeringPrincipal
                                          Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL,
                                          Ci.nsIContentPolicy.TYPE_OTHER);
     proxyChannel.asyncOpen2(SpecialPowers.wrapCallbackObject(new proxyChannelListener()));
   }
 });
 
 function startup() {
-  //need to allow for arbitrary network servers defined in PAC instead of a hardcoded moz-proxy.
+  // Need to allow for arbitrary network servers defined in PAC instead of a hardcoded moz-proxy.
   var ios = SpecialPowers.Cc["@mozilla.org/network/io-service;1"].
     getService(SpecialPowers.Ci.nsIIOService);
 
   var pps = SpecialPowers.Cc["@mozilla.org/network/protocol-proxy-service;1"].getService();
 
   var channel = ios.newChannel2("http://example.com",
                                 null,
                                 null,
--- a/toolkit/components/passwordmgr/test/prompt_common.js
+++ b/toolkit/components/passwordmgr/test/prompt_common.js
@@ -44,17 +44,17 @@ var observer = SpecialPowers.wrapCallbac
     }
 });
 
 function getDialogDoc() {
   // Find the <browser> which contains notifyWindow, by looking
   // through all the open windows and all the <browsers> in each.
   var wm = Cc["@mozilla.org/appshell/window-mediator;1"].
            getService(Ci.nsIWindowMediator);
-  //var enumerator = wm.getEnumerator("navigator:browser");
+  // var enumerator = wm.getEnumerator("navigator:browser");
   var enumerator = wm.getXULWindowEnumerator(null);
 
   while (enumerator.hasMoreElements()) {
     var win = enumerator.getNext();
     var windowDocShell = win.QueryInterface(Ci.nsIXULWindow).docShell;
 
     var containedDocShells = windowDocShell.getDocShellEnumerator(
                                       Ci.nsIDocShellTreeItem.typeChrome,
@@ -64,16 +64,16 @@ function getDialogDoc() {
         var childDocShell = containedDocShells.getNext();
         // We don't want it if it's not done loading.
         if (childDocShell.busyFlags != Ci.nsIDocShell.BUSY_FLAGS_NONE)
           continue;
         var childDoc = childDocShell.QueryInterface(Ci.nsIDocShell)
                                     .contentViewer
                                     .DOMDocument;
 
-        //ok(true, "Got window: " + childDoc.location.href);
+        // ok(true, "Got window: " + childDoc.location.href);
         if (childDoc.location.href == "chrome://global/content/commonDialog.xul")
           return childDoc;
     }
   }
 
   return null;
 }
--- a/toolkit/components/passwordmgr/test/test_prompt_async.html
+++ b/toolkit/components/passwordmgr/test/test_prompt_async.html
@@ -140,17 +140,17 @@
 
 	onProxyAvailable : function (req, uri, pi, status) {
           initLogins(pi);
           doTest(testNum);
 	}
 	});
 
 	function startup() {
-            //need to allow for arbitrary network servers defined in PAC instead of a hardcoded moz-proxy.
+            // Need to allow for arbitrary network servers defined in PAC instead of a hardcoded moz-proxy.
             var channel = NetUtil.newChannel({
                 uri: "http://example.com",
                 loadUsingSystemPrincipal: true
             });
 
             var pps = SpecialPowers.Cc["@mozilla.org/network/protocol-proxy-service;1"]
                                    .getService();
 
--- a/toolkit/components/passwordmgr/test/unit/head.js
+++ b/toolkit/components/passwordmgr/test/unit/head.js
@@ -1,16 +1,16 @@
 /**
  * Provides infrastructure for automated login components tests.
  */
 
 "use strict";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 let { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/LoginRecipes.jsm");
 Cu.import("resource://gre/modules/LoginHelper.jsm");
 Cu.import("resource://testing-common/MockDocument.jsm");
@@ -39,18 +39,18 @@ const newPropertyBag = LoginHelper.newPr
  * All the tests are implemented with add_task, this starts them automatically.
  */
 function run_test()
 {
   do_get_profile();
   run_next_test();
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Global helpers
+// //////////////////////////////////////////////////////////////////////////////
+// // Global helpers
 
 // Some of these functions are already implemented in other parts of the source
 // tree, see bug 946708 about sharing more code.
 
 // While the previous test file should have deleted all the temporary files it
 // used, on Windows these might still be pending deletion on the physical file
 // system.  Thus, start from a new base number every time, to make a collision
 // with a file that is still pending deletion highly unlikely.
@@ -85,25 +85,25 @@ function getTempFile(aLeafName)
     if (file.exists()) {
       file.remove(false);
     }
   });
 
   return file;
 }
 
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
 
 const RecipeHelpers = {
   initNewParent() {
     return (new LoginRecipesParent({ defaults: null })).initializationPromise;
   },
 };
 
-//// Initialization functions common to all tests
+// // Initialization functions common to all tests
 
 add_task(function* test_common_initialize()
 {
   // Before initializing the service for the first time, we should copy the key
   // file required to decrypt the logins contained in the SQLite databases used
   // by migration tests.  This file is not required for the other tests.
   yield OS.File.copy(do_get_file("data/key3.db").path,
                      OS.Path.join(OS.Constants.Path.profileDir, "key3.db"));
--- a/toolkit/components/passwordmgr/test/unit/test_OSCrypto_win.js
+++ b/toolkit/components/passwordmgr/test/unit/test_OSCrypto_win.js
@@ -1,24 +1,24 @@
 /**
  * Tests the OSCrypto object.
  */
 
 "use strict";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 XPCOMUtils.defineLazyModuleGetter(this,  "OSCrypto",
                                   "resource://gre/modules/OSCrypto.jsm");
 
 var crypto = new OSCrypto();
 
-////////////////////////////////////////////////////////////////////////////////
-//// Tests
+// //////////////////////////////////////////////////////////////////////////////
+// // Tests
 
 add_task(function test_getIELoginHash()
 {
   do_check_eq(crypto.getIELoginHash("https://bugzilla.mozilla.org/page.cgi"),
                                     "4A66FE96607885790F8E67B56EEE52AB539BAFB47D");
 
   do_check_eq(crypto.getIELoginHash("https://github.com/login"),
                                     "0112F7DCE67B8579EA01367678AA44AB9868B5A143");
--- a/toolkit/components/passwordmgr/test/unit/test_disabled_hosts.js
+++ b/toolkit/components/passwordmgr/test/unit/test_disabled_hosts.js
@@ -4,18 +4,18 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Tests getLoginSavingEnabled, setLoginSavingEnabled, and getAllDisabledHosts.
  */
 
 "use strict";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Tests
+// //////////////////////////////////////////////////////////////////////////////
+// // Tests
 
 /**
  * Tests setLoginSavingEnabled and getAllDisabledHosts.
  */
 add_task(function test_setLoginSavingEnabled_getAllDisabledHosts()
 {
   // Add some disabled hosts, and verify that different schemes for the same
   // domain are considered different hosts.
--- a/toolkit/components/passwordmgr/test/unit/test_getFormFields.js
+++ b/toolkit/components/passwordmgr/test/unit/test_getFormFields.js
@@ -1,15 +1,15 @@
 /*
  * Test for LoginManagerContent._getFormFields.
  */
 
 "use strict";
 
-//Services.prefs.setBoolPref("signon.debug", true);
+// Services.prefs.setBoolPref("signon.debug", true);
 
 Cu.importGlobalProperties(["URL"]);
 
 const LMCBackstagePass = Cu.import("resource://gre/modules/LoginManagerContent.jsm");
 const { LoginManagerContent, LoginFormFactory } = LMCBackstagePass;
 const TESTCASES = [
   {
     description: "1 password field outside of a <form>",
--- a/toolkit/components/passwordmgr/test/unit/test_legacy_empty_formSubmitURL.js
+++ b/toolkit/components/passwordmgr/test/unit/test_legacy_empty_formSubmitURL.js
@@ -32,18 +32,18 @@
  *
  * The only way to have such condition is to be using logins that were initially
  * saved by a very old version of the browser, or because of data manually added
  * by an extension in an old version.
  */
 
 "use strict";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Tests
+// //////////////////////////////////////////////////////////////////////////////
+// // Tests
 
 /**
  * Adds a login with an empty formSubmitURL, then it verifies that no other
  * form logins can be added for the same host.
  */
 add_task(function test_addLogin_wildcard()
 {
   let loginInfo = TestData.formLogin({ hostname: "http://any.example.com",
--- a/toolkit/components/passwordmgr/test/unit/test_legacy_validation.js
+++ b/toolkit/components/passwordmgr/test/unit/test_legacy_validation.js
@@ -8,18 +8,18 @@
  *
  * These rules exist because of limitations of the "signons.txt" storage file,
  * that is not used anymore.  They are still enforced by the Login Manager
  * service, despite these values can now be safely stored in the back-end.
  */
 
 "use strict";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Tests
+// //////////////////////////////////////////////////////////////////////////////
+// // Tests
 
 /**
  * Tests legacy validation with addLogin.
  */
 add_task(function test_addLogin_invalid_characters_legacy()
 {
   // Test newlines and carriage returns in properties that contain URLs.
   for (let testValue of ["http://newline\n.example.com",
--- a/toolkit/components/passwordmgr/test/unit/test_logins_change.js
+++ b/toolkit/components/passwordmgr/test/unit/test_logins_change.js
@@ -4,18 +4,18 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Tests methods that add, remove, and modify logins.
  */
 
 "use strict";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 /**
  * Verifies that the specified login is considered invalid by addLogin and by
  * modifyLogin with both nsILoginInfo and nsIPropertyBag arguments.
  *
  * This test requires that the login store is empty.
  *
  * @param aLoginInfo
@@ -70,18 +70,18 @@ function checkLoginInvalid(aLoginInfo, a
 function compareAttributes(objectA, objectB, attributes) {
   // If it's the same object, we want to return false.
   if (objectA == objectB) {
     return false;
   }
   return attributes.every(attr => objectA[attr] == objectB[attr]);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Tests
+// //////////////////////////////////////////////////////////////////////////////
+// // Tests
 
 /**
  * Tests that adding logins to the database works.
  */
 add_task(function test_addLogin_removeLogin()
 {
   // Each login from the test data should be valid and added to the list.
   for (let loginInfo of TestData.loginList()) {
--- a/toolkit/components/passwordmgr/test/unit/test_logins_decrypt_failure.js
+++ b/toolkit/components/passwordmgr/test/unit/test_logins_decrypt_failure.js
@@ -4,33 +4,33 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Tests the case where there are logins that cannot be decrypted.
  */
 
 "use strict";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 /**
  * Resets the token used to decrypt logins.  This is equivalent to resetting the
  * master password when it is not known.
  */
 function resetMasterPassword()
 {
   let token = Cc["@mozilla.org/security/pk11tokendb;1"]
                 .getService(Ci.nsIPK11TokenDB).getInternalKeyToken();
   token.reset();
   token.changePassword("", "");
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Tests
+// //////////////////////////////////////////////////////////////////////////////
+// // Tests
 
 /**
  * Resets the master password after some logins were added to the database.
  */
 add_task(function test_logins_decrypt_failure()
 {
   let logins = TestData.loginList();
   for (let loginInfo of logins) {
--- a/toolkit/components/passwordmgr/test/unit/test_logins_metainfo.js
+++ b/toolkit/components/passwordmgr/test/unit/test_logins_metainfo.js
@@ -5,18 +5,18 @@
 
 /**
  * Tests the handling of nsILoginMetaInfo by methods that add, remove, modify,
  * and find logins.
  */
 
 "use strict";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 XPCOMUtils.defineLazyServiceGetter(this, "gUUIDGenerator",
                                    "@mozilla.org/uuid-generator;1",
                                    "nsIUUIDGenerator");
 
 var gLooksLikeUUIDRegex = /^\{\w{8}-\w{4}-\w{4}-\w{4}-\w{12}\}$/;
 
 /**
@@ -60,18 +60,18 @@ var gLoginInfo3;
 /**
  * nsILoginInfo instances reloaded with all the nsILoginMetaInfo properties.
  * These are often used to provide the reference values to test against.
  */
 var gLoginMetaInfo1;
 var gLoginMetaInfo2;
 var gLoginMetaInfo3;
 
-////////////////////////////////////////////////////////////////////////////////
-//// Tests
+// //////////////////////////////////////////////////////////////////////////////
+// // Tests
 
 /**
  * Prepare the test objects that will be used by the following tests.
  */
 add_task(function test_initialize()
 {
   // Use a reference time from ten minutes ago to initialize one instance of
   // nsILoginMetaInfo, to test that reference times are updated when needed.
--- a/toolkit/components/passwordmgr/test/unit/test_logins_search.js
+++ b/toolkit/components/passwordmgr/test/unit/test_logins_search.js
@@ -3,18 +3,18 @@
  * searchLogins, and countLogins).
  *
  * The getAllLogins method is not tested explicitly here, because it is used by
  * all tests to verify additions, removals and modifications to the login store.
  */
 
 "use strict";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 /**
  * Returns a list of new nsILoginInfo objects that are a subset of the test
  * data, built to match the specified query.
  *
  * @param aQuery
  *        Each property and value of this object restricts the search to those
  *        entries from the test data that match the property exactly.
@@ -87,18 +87,18 @@ function checkAllSearches(aQuery, aExpec
   // Test countLogins.
   let count = Services.logins.countLogins(hostname, formSubmitURL, httpRealm);
   do_check_eq(count, expectedLogins.length);
 
   // Test searchLogins.
   checkSearchLogins(aQuery, aExpectedCount);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Tests
+// //////////////////////////////////////////////////////////////////////////////
+// // Tests
 
 /**
  * Prepare data for the following tests.
  */
 add_task(function test_initialize()
 {
   for (let login of TestData.loginList()) {
     Services.logins.addLogin(login);
--- a/toolkit/components/passwordmgr/test/unit/test_module_LoginImport.js
+++ b/toolkit/components/passwordmgr/test/unit/test_module_LoginImport.js
@@ -4,18 +4,18 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Tests the LoginImport object.
  */
 
 "use strict";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 Cu.import("resource://gre/modules/Task.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "LoginHelper",
                                   "resource://gre/modules/LoginHelper.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "LoginImport",
                                   "resource://gre/modules/LoginImport.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "LoginStore",
@@ -102,18 +102,18 @@ function promiseInsertLoginInfo(aConnect
  * Inserts a new disabled host entry in the database.
  */
 function promiseInsertDisabledHost(aConnection, aHostname)
 {
   return aConnection.execute("INSERT INTO moz_disabledHosts (hostname) " +
                              "VALUES (?)", [aHostname]);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Tests
+// //////////////////////////////////////////////////////////////////////////////
+// // Tests
 
 /**
  * Imports login data from a SQLite file constructed using the test data.
  */
 add_task(function* test_import()
 {
   let store = new LoginStore(getTempFile("test-import.json").path);
   let loginsSqlite = getTempFile("test-logins.sqlite").path;
--- a/toolkit/components/passwordmgr/test/unit/test_module_LoginStore.js
+++ b/toolkit/components/passwordmgr/test/unit/test_module_LoginStore.js
@@ -4,26 +4,26 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Tests the LoginStore object.
  */
 
 "use strict";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 XPCOMUtils.defineLazyModuleGetter(this, "LoginStore",
                                   "resource://gre/modules/LoginStore.jsm");
 
 const TEST_STORE_FILE_NAME = "test-logins.json";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Tests
+// //////////////////////////////////////////////////////////////////////////////
+// // Tests
 
 /**
  * Saves login data to a file, then reloads it.
  */
 add_task(function* test_save_reload()
 {
   let storeForSave = new LoginStore(getTempFile(TEST_STORE_FILE_NAME).path);
 
--- a/toolkit/components/passwordmgr/test/unit/test_storage.js
+++ b/toolkit/components/passwordmgr/test/unit/test_storage.js
@@ -6,28 +6,28 @@
 /**
  * Tests that the default nsILoginManagerStorage module attached to the Login
  * Manager service is able to save and reload nsILoginInfo properties correctly,
  * even when they include special characters.
  */
 
 "use strict";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 function* reloadAndCheckLoginsGen(aExpectedLogins)
 {
   yield LoginTestUtils.reloadData();
   LoginTestUtils.checkLogins(aExpectedLogins);
   LoginTestUtils.clearData();
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Tests
+// //////////////////////////////////////////////////////////////////////////////
+// // Tests
 
 /**
  * Tests addLogin with valid non-ASCII characters.
  */
 add_task(function* test_storage_addLogin_nonascii()
 {
   let hostname = "http://" + String.fromCharCode(355) + ".example.com";
 
--- a/toolkit/components/passwordmgr/test/unit/test_telemetry.js
+++ b/toolkit/components/passwordmgr/test/unit/test_telemetry.js
@@ -4,18 +4,18 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Tests the statistics and other counters reported through telemetry.
  */
 
 "use strict";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 const MS_PER_DAY = 24 * 60 * 60 * 1000;
 
 // To prevent intermittent failures when the test is executed at a time that is
 // very close to a day boundary, we make it deterministic by using a static
 // reference date for all the time-based statistics.
 const gReferenceTimeMs = new Date("2000-01-01T00:00:00").getTime();
 
@@ -97,18 +97,18 @@ function testHistogram(histogramId, expe
   }
 
   // These are stringified to visualize the differences between the values.
   do_print("Testing histogram: " + histogramId);
   do_check_eq(JSON.stringify(actualNonZeroRanges),
               JSON.stringify(expectedNonZeroRanges));
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Tests
+// //////////////////////////////////////////////////////////////////////////////
+// // Tests
 
 /**
  * Enable local telemetry recording for the duration of the tests, and prepare
  * the test data that will be used by the following tests.
  */
 add_task(function test_initialize() {
   let oldCanRecord = Services.telemetry.canRecordExtended;
   Services.telemetry.canRecordExtended = true;
--- a/toolkit/components/perfmonitoring/PerformanceStats.jsm
+++ b/toolkit/components/perfmonitoring/PerformanceStats.jsm
@@ -910,17 +910,17 @@ var Process = {
   get loader() {
     if (isContent) {
       return null;
     }
     if (this._loader) {
       return this._loader;
     }
     Services.ppmm.loadProcessScript("resource://gre/modules/PerformanceStats-content.js",
-      true/*including future processes*/);
+      true/* including future processes*/);
     return this._loader = Services.ppmm;
   },
 
   /**
    * Broadcast a message to all children processes.
    *
    * NOOP if we are in a child process.
    */
--- a/toolkit/components/perfmonitoring/PerformanceWatcher.jsm
+++ b/toolkit/components/perfmonitoring/PerformanceWatcher.jsm
@@ -61,17 +61,17 @@ let { Services } = Cu.import("resource:/
 let isContent = Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT;
 
 if (!isContent) {
   // Initialize communication with children.
   //
   // To keep the protocol simple, the children inform the parent whenever a slow
   // add-on/tab is detected. We do not attempt to implement thresholds.
   Services.ppmm.loadProcessScript("resource://gre/modules/PerformanceWatcher-content.js",
-    true/*including future processes*/);
+    true/* including future processes*/);
 
   Services.ppmm.addMessageListener("performancewatcher-propagate-notifications",
     (...args) => ChildManager.notifyObservers(...args)
   );
 }
 
 // Configure the performance stats service to inform us in case of jank.
 performanceStatsService.jankAlertThreshold = 64000 /* us */;
--- a/toolkit/components/places/Bookmarks.jsm
+++ b/toolkit/components/places/Bookmarks.jsm
@@ -773,17 +773,17 @@ var Bookmarks = Object.freeze({
     return Task.spawn(function* () {
       let results = yield queryBookmarks(query);
 
       return results;
     });
   },
 });
 
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
 // Globals.
 
 /**
  * Sends a bookmarks notification through the given observers.
  *
  * @param observers
  *        array of nsINavBookmarkObserver objects.
  * @param notification
@@ -794,17 +794,17 @@ var Bookmarks = Object.freeze({
 function notify(observers, notification, args) {
   for (let observer of observers) {
     try {
       observer[notification](...args);
     } catch (ex) {}
   }
 }
 
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
 // Update implementation.
 
 function updateBookmark(info, item, newParent) {
   return PlacesUtils.withConnectionWrapper("Bookmarks.jsm: updateBookmark",
     Task.async(function*(db) {
 
     let tuples = new Map();
     if (info.hasOwnProperty("lastModified"))
@@ -879,17 +879,17 @@ function updateBookmark(info, item, newP
     // Don't return an empty title to the caller.
     if (updatedItem.hasOwnProperty("title") && updatedItem.title === null)
       delete updatedItem.title;
 
     return updatedItem;
   }));
 }
 
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
 // Insert implementation.
 
 function insertBookmark(item, parent) {
   return PlacesUtils.withConnectionWrapper("Bookmarks.jsm: insertBookmark",
     Task.async(function*(db) {
 
     // If a guid was not provided, generate one, so we won't need to fetch the
     // bookmark just after having created it.
@@ -934,17 +934,17 @@ function insertBookmark(item, parent) {
     // Don't return an empty title to the caller.
     if (item.hasOwnProperty("title") && item.title === null)
       delete item.title;
 
     return item;
   }));
 }
 
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
 // Query implementation.
 
 function queryBookmarks(info) {
   let queryParams = {tags_folder: PlacesUtils.tagsFolderId};
   // we're searching for bookmarks, so exclude tags
   let queryString = "WHERE p.parent <> :tags_folder";
 
   if (info.title) {
@@ -984,17 +984,17 @@ function queryBookmarks(info) {
        ${queryString}
       `, queryParams);
 
     return rowsToItemsArray(rows);
   }));
 }
 
 
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
 // Fetch implementation.
 
 function fetchBookmark(info) {
   return PlacesUtils.withConnectionWrapper("Bookmarks.jsm: fetchBookmark",
     Task.async(function*(db) {
 
     let rows = yield db.executeCached(
       `SELECT b.guid, IFNULL(p.guid, "") AS parentGuid, b.position AS 'index',
@@ -1096,17 +1096,17 @@ function fetchBookmarksByParent(info) {
        WHERE p.guid = :parentGuid
        ORDER BY b.position ASC
       `, { parentGuid: info.parentGuid });
 
     return rowsToItemsArray(rows);
   }));
 }
 
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
 // Remove implementation.
 
 function removeBookmark(item, options) {
   return PlacesUtils.withConnectionWrapper("Bookmarks.jsm: removeBookmark",
     Task.async(function*(db) {
 
     let isUntagging = item._grandParentId == PlacesUtils.tagsFolderId;
 
@@ -1145,17 +1145,17 @@ function removeBookmark(item, options) {
       // ...though we don't wait for the calculation.
       updateFrecency(db, [item.url]).then(null, Cu.reportError);
     }
 
     return item;
   }));
 }
 
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
 // Reorder implementation.
 
 function reorderChildren(parent, orderedChildrenGuids) {
   return PlacesUtils.withConnectionWrapper("Bookmarks.jsm: updateBookmark",
     db => db.executeTransaction(function* () {
       // Select all of the direct children for the given parent.
       let children = yield fetchBookmarksByParent({ parentGuid: parent.guid });
       if (!children.length)
@@ -1231,17 +1231,17 @@ function reorderChildren(parent, ordered
 
       yield db.executeCached(`DROP TRIGGER moz_bookmarks_reorder_trigger`);
 
       return children;
     }.bind(this))
   );
 }
 
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
 // Helpers.
 
 /**
  * Merges objects into a new object, included non-enumerable properties.
  *
  * @param sources
  *        source objects to merge.
  * @return a new object including all properties from the source objects.
--- a/toolkit/components/places/History.jsm
+++ b/toolkit/components/places/History.jsm
@@ -726,17 +726,17 @@ var notifyCleanup = Task.async(function*
       // For the moment, we do not have the necessary observer API
       // to notify when we remove a subset of visits, see bug 937560.
       continue;
     }
     if (page.hasForeign) {
       // We have removed all visits, but the page is still alive, e.g.
       // because of a bookmark.
       notify(observers, "onDeleteVisits",
-        [uri, /*last visit*/0, guid, reason, -1]);
+        [uri, /* last visit*/0, guid, reason, -1]);
     } else {
       // The page has been entirely removed.
       notify(observers, "onDeleteURI",
         [uri, guid, reason]);
     }
     if (++notifiedCount % NOTIFICATION_CHUNK_SIZE == 0) {
       // Every few notifications, yield time back to the main
       // thread to avoid jank.
--- a/toolkit/components/places/PlacesCategoriesStarter.js
+++ b/toolkit/components/places/PlacesCategoriesStarter.js
@@ -1,29 +1,29 @@
 /* -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
  * vim: sw=2 ts=2 sts=2 expandtab
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-////////////////////////////////////////////////////////////////////////////////
-//// Constants
+// //////////////////////////////////////////////////////////////////////////////
+// // Constants
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 
 // Fired by TelemetryController when async telemetry data should be collected.
 const TOPIC_GATHER_TELEMETRY = "gather-telemetry";
 
 // Seconds between maintenance runs.
 const MAINTENANCE_INTERVAL_SECONDS = 7 * 86400;
 
-////////////////////////////////////////////////////////////////////////////////
-//// Imports
+// //////////////////////////////////////////////////////////////////////////////
+// // Imports
 
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/PlacesUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "PlacesDBUtils",
                                   "resource://gre/modules/PlacesDBUtils.jsm");
 
 /**
@@ -53,18 +53,18 @@ function PlacesCategoriesStarter()
   };
 
   [ "onItemAdded", "onItemRemoved", "onItemChanged", "onBeginUpdateBatch",
     "onEndUpdateBatch", "onItemVisited", "onItemMoved"
   ].forEach(aMethod => this[aMethod] = notify);
 }
 
 PlacesCategoriesStarter.prototype = {
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsIObserver
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsIObserver
 
   observe: function PCS_observe(aSubject, aTopic, aData)
   {
     switch (aTopic) {
       case PlacesUtils.TOPIC_SHUTDOWN:
         Services.obs.removeObserver(this, PlacesUtils.TOPIC_SHUTDOWN);
         Services.obs.removeObserver(this, TOPIC_GATHER_TELEMETRY);
         let globalObj =
@@ -90,26 +90,26 @@ PlacesCategoriesStarter.prototype = {
           PlacesDBUtils.maintenanceOnIdle();
         }
         break;
       default:
         throw new Error("Trying to handle an unknown category.");
     }
   },
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsISupports
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsISupports
 
   classID: Components.ID("803938d5-e26d-4453-bf46-ad4b26e41114"),
 
   _xpcom_factory: XPCOMUtils.generateSingletonFactory(PlacesCategoriesStarter),
 
   QueryInterface: XPCOMUtils.generateQI([
     Ci.nsIObserver
   , Ci.nsINavBookmarkObserver
   ])
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// Module Registration
+// //////////////////////////////////////////////////////////////////////////////
+// // Module Registration
 
 var components = [PlacesCategoriesStarter];
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);
--- a/toolkit/components/places/PlacesDBUtils.jsm
+++ b/toolkit/components/places/PlacesDBUtils.jsm
@@ -10,32 +10,32 @@ const Cr = Components.results;
 const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/PlacesUtils.jsm");
 
 this.EXPORTED_SYMBOLS = [ "PlacesDBUtils" ];
 
-////////////////////////////////////////////////////////////////////////////////
-//// Constants
+// //////////////////////////////////////////////////////////////////////////////
+// // Constants
 
 const FINISHED_MAINTENANCE_TOPIC = "places-maintenance-finished";
 
 const BYTES_PER_MEBIBYTE = 1048576;
 
-////////////////////////////////////////////////////////////////////////////////
-//// Smart getters
+// //////////////////////////////////////////////////////////////////////////////
+// // Smart getters
 
 XPCOMUtils.defineLazyGetter(this, "DBConn", function() {
   return PlacesUtils.history.QueryInterface(Ci.nsPIPlacesDatabase).DBConnection;
 });
 
-////////////////////////////////////////////////////////////////////////////////
-//// PlacesDBUtils
+// //////////////////////////////////////////////////////////////////////////////
+// // PlacesDBUtils
 
 this.PlacesDBUtils = {
   /**
    * Executes a list of maintenance tasks.
    * Once finished it will pass a array log to the callback attached to tasks.
    * FINISHED_MAINTENANCE_TOPIC is notified through observer service on finish.
    *
    * @param aTasks
--- a/toolkit/components/places/PlacesTransactions.jsm
+++ b/toolkit/components/places/PlacesTransactions.jsm
@@ -1059,17 +1059,17 @@ function* createItemsFromBookmarksTree(a
     }
     return itemId;
   }
   return yield createItem(aBookmarksTree,
                           aBookmarksTree.parentGuid,
                           aBookmarksTree.index);
 }
 
-/*****************************************************************************
+/** ***************************************************************************
  * The Standard Places Transactions.
  *
  * See the documentation at the top of this file. The valid values for input
  * are also documented there.
  *****************************************************************************/
 
 var PT = PlacesTransactions;
 
@@ -1309,17 +1309,17 @@ PT.Annotate.prototype = {
     let undoAnnosForItem = new Map(); // itemId => undoAnnos;
     for (let guid of aGuids) {
       let itemId = yield PlacesUtils.promiseItemId(guid);
       let currentAnnos = PlacesUtils.getAnnotationsForItem(itemId);
 
       let undoAnnos = [];
       for (let newAnno of aNewAnnos) {
         let currentAnno = currentAnnos.find(a => a.name == newAnno.name);
-        if (!!currentAnno) {
+        if (currentAnno) {
           undoAnnos.push(currentAnno);
         }
         else {
           // An unset value removes the annotation.
           undoAnnos.push({ name: newAnno.name });
         }
       }
       undoAnnosForItem.set(itemId, undoAnnos);
--- a/toolkit/components/places/PlacesUtils.jsm
+++ b/toolkit/components/places/PlacesUtils.jsm
@@ -571,18 +571,18 @@ this.PlacesUtils = {
   {
     // If this is the first registered function, add the shutdown observer.
     if (this._shutdownFunctions.length == 0) {
       Services.obs.addObserver(this, this.TOPIC_SHUTDOWN, false);
     }
     this._shutdownFunctions.push(aFunc);
   },
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsIObserver
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsIObserver
   observe: function PU_observe(aSubject, aTopic, aData)
   {
     switch (aTopic) {
       case this.TOPIC_SHUTDOWN:
         Services.obs.removeObserver(this, this.TOPIC_SHUTDOWN);
         while (this._shutdownFunctions.length > 0) {
           this._shutdownFunctions.shift().apply(this);
         }
@@ -605,18 +605,18 @@ this.PlacesUtils = {
         break;
     }
   },
 
   onPageAnnotationSet: function() {},
   onPageAnnotationRemoved: function() {},
 
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsITransactionListener
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsITransactionListener
 
   didDo: function PU_didDo(aManager, aTransaction, aDoResult)
   {
     updateCommandsOnActiveWindow();
   },
 
   didUndo: function PU_didUndo(aManager, aTransaction, aUndoResult)
   {
@@ -2546,18 +2546,18 @@ var GuidHelper = {
       PlacesUtils.bookmarks.addObserver(this.observer, false);
       PlacesUtils.registerShutdownFunction(() => {
         PlacesUtils.bookmarks.removeObserver(this.observer);
       });
     }
   }
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// Transactions handlers.
+// //////////////////////////////////////////////////////////////////////////////
+// // Transactions handlers.
 
 /**
  * Updates commands in the undo group of the active window commands.
  * Inactive windows commands will be updated on focus.
  */
 function updateCommandsOnActiveWindow()
 {
   let win = Services.focus.activeWindow;
--- a/toolkit/components/places/UnifiedComplete.js
+++ b/toolkit/components/places/UnifiedComplete.js
@@ -1,18 +1,18 @@
 /* -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
  * vim: sw=2 ts=2 sts=2 expandtab
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Constants
+// //////////////////////////////////////////////////////////////////////////////
+// // Constants
 
 const { classes: Cc, interfaces: Ci, results: Cr, utils: Cu } = Components;
 
 // Match type constants.
 // These indicate what type of search function we should be using.
 const MATCH_ANYWHERE = Ci.mozIPlacesAutoComplete.MATCH_ANYWHERE;
 const MATCH_BOUNDARY_ANYWHERE = Ci.mozIPlacesAutoComplete.MATCH_BOUNDARY_ANYWHERE;
 const MATCH_BOUNDARY = Ci.mozIPlacesAutoComplete.MATCH_BOUNDARY;
@@ -241,18 +241,18 @@ const SQL_URL_QUERY = urlQuery();
 
 const SQL_TYPED_URL_QUERY = urlQuery("AND h.typed = 1");
 
 // TODO (bug 1045924): use foreign_count once available.
 const SQL_BOOKMARKED_URL_QUERY = urlQuery("AND bookmarked");
 
 const SQL_BOOKMARKED_TYPED_URL_QUERY = urlQuery("AND bookmarked AND h.typed = 1");
 
-////////////////////////////////////////////////////////////////////////////////
-//// Getters
+// //////////////////////////////////////////////////////////////////////////////
+// // Getters
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
                                   "resource://gre/modules/PlacesUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "TelemetryStopwatch",
                                   "resource://gre/modules/TelemetryStopwatch.jsm");
@@ -499,18 +499,18 @@ XPCOMUtils.defineLazyGetter(this, "Prefs
 
   loadPrefs();
   prefs.observe("", store);
   Services.prefs.addObserver("keyword.enabled", store, true);
 
   return Object.seal(store);
 });
 
-////////////////////////////////////////////////////////////////////////////////
-//// Helper functions
+// //////////////////////////////////////////////////////////////////////////////
+// // Helper functions
 
 /**
  * Used to unescape encoded URI strings and drop information that we do not
  * care about.
  *
  * @param spec
  *        The text to unescape and modify.
  * @return the modified spec.
@@ -619,17 +619,17 @@ function makeKeyForURL(actionUrl) {
  */
 function looksLikeUrl(str, ignoreAlphanumericHosts = false) {
   // Single word not including special chars.
   return !REGEXP_SPACES.test(str) &&
          (["/", "@", ":", "["].some(c => str.includes(c)) ||
           (ignoreAlphanumericHosts ? /(.*\..*){3,}/.test(str) : str.includes(".")));
 }
 
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
 
 /**
  * Manages a single instance of an autocomplete search.
  *
  * The first three parameters all originate from the similarly named parameters
  * of nsIAutoCompleteSearch.startSearch().
  *
  * @param searchString
@@ -1831,31 +1831,31 @@ Search.prototype = {
     if (searchOngoing) {
       resultCode += "_ONGOING";
     }
     result.setSearchResult(Ci.nsIAutoCompleteResult[resultCode]);
     this._listener.onSearchResult(this._autocompleteSearch, result);
   },
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// UnifiedComplete class
-//// component @mozilla.org/autocomplete/search;1?name=unifiedcomplete
+// //////////////////////////////////////////////////////////////////////////////
+// // UnifiedComplete class
+// // component @mozilla.org/autocomplete/search;1?name=unifiedcomplete
 
 function UnifiedComplete() {
   // Make sure the preferences are initialized as soon as possible.
   // If the value of browser.urlbar.autocomplete.enabled is set to false,
   // then all the other suggest preferences for history, bookmarks and
   // open pages should be set to false.
   Prefs;
 }
 
 UnifiedComplete.prototype = {
-  //////////////////////////////////////////////////////////////////////////////
-  //// Database handling
+  // ////////////////////////////////////////////////////////////////////////////
+  // // Database handling
 
   /**
    * Promise resolved when the database initialization has completed, or null
    * if it has never been requested.
    */
   _promiseDatabase: null,
 
   /**
@@ -1895,29 +1895,29 @@ UnifiedComplete.prototype = {
 
         return conn;
       }.bind(this)).then(null, ex => { dump("Couldn't get database handle: " + ex + "\n");
                                        Cu.reportError(ex); });
     }
     return this._promiseDatabase;
   },
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// mozIPlacesAutoComplete
+  // ////////////////////////////////////////////////////////////////////////////
+  // // mozIPlacesAutoComplete
 
   registerOpenPage: function PAC_registerOpenPage(uri) {
     SwitchToTabStorage.add(uri);
   },
 
   unregisterOpenPage: function PAC_unregisterOpenPage(uri) {
     SwitchToTabStorage.delete(uri);
   },
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsIAutoCompleteSearch
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsIAutoCompleteSearch
 
   startSearch: function (searchString, searchParam, previousResult, listener) {
     // Stop the search in case the controller has not taken care of it.
     if (this._currentSearch) {
       this.stopSearch();
     }
 
     // Note: We don't use previousResult to make sure ordering of results are
@@ -1989,38 +1989,38 @@ UnifiedComplete.prototype = {
     // If onSearchComplete immediately starts a new search it will set a new
     // _currentSearch, and on return the execution will continue here, after
     // notifyResults.
     // Thus, ensure that notifyResults is the last call in this method,
     // otherwise you might be touching the wrong search.
     search.notifyResults(false);
   },
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsIAutoCompleteSimpleResultListener
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsIAutoCompleteSimpleResultListener
 
   onValueRemoved: function (result, spec, removeFromDB) {
     if (removeFromDB) {
       PlacesUtils.history.removePage(NetUtil.newURI(spec));
     }
   },
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsIAutoCompleteSearchDescriptor
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsIAutoCompleteSearchDescriptor
 
   get searchType() {
     return Ci.nsIAutoCompleteSearchDescriptor.SEARCH_TYPE_IMMEDIATE;
   },
 
   get clearingAutoFillSearchesAgain() {
     return true;
   },
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsISupports
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsISupports
 
   classID: Components.ID("f964a319-397a-4d21-8be6-5cdd1ee3e3ae"),
 
   _xpcom_factory: XPCOMUtils.generateSingletonFactory(UnifiedComplete),
 
   QueryInterface: XPCOMUtils.generateQI([
     Ci.nsIAutoCompleteSearch,
     Ci.nsIAutoCompleteSimpleResultListener,
--- a/toolkit/components/places/nsLivemarkService.js
+++ b/toolkit/components/places/nsLivemarkService.js
@@ -1,16 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const { classes: Cc, interfaces: Ci, results: Cr, utils: Cu } = Components;
 
-////////////////////////////////////////////////////////////////////////////////
-//// Modules and services.
+// //////////////////////////////////////////////////////////////////////////////
+// // Modules and services.
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
                                   "resource://gre/modules/PlacesUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
                                   "resource://gre/modules/NetUtil.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Task",
@@ -19,28 +19,28 @@ XPCOMUtils.defineLazyModuleGetter(this, 
                                   "resource://gre/modules/Deprecated.jsm");
 
 XPCOMUtils.defineLazyGetter(this, "asyncHistory", function () {
   // Lazily add an history observer when it's actually needed.
   PlacesUtils.history.addObserver(PlacesUtils.livemarks, true);
   return PlacesUtils.asyncHistory;
 });
 
-////////////////////////////////////////////////////////////////////////////////
-//// Constants
+// //////////////////////////////////////////////////////////////////////////////
+// // Constants
 
 // Delay between reloads of consecute livemarks.
 const RELOAD_DELAY_MS = 500;
 // Expire livemarks after this time.
 const EXPIRE_TIME_MS = 3600000; // 1 hour.
 // Expire livemarks after this time on error.
 const ONERROR_EXPIRE_TIME_MS = 300000; // 5 minutes.
 
-////////////////////////////////////////////////////////////////////////////////
-//// Livemarks cache.
+// //////////////////////////////////////////////////////////////////////////////
+// // Livemarks cache.
 
 XPCOMUtils.defineLazyGetter(this, "CACHE_SQL", () => {
   function getAnnoSQLFragment(aAnnoParam) {
     return `SELECT a.content
             FROM moz_items_annos a
             JOIN moz_anno_attributes n ON n.id = a.anno_attribute_id
             WHERE a.item_id = b.id
               AND n.name = ${aAnnoParam}`;
@@ -103,18 +103,18 @@ function toPRTime(date) {
  * @param time
  *        microseconds from the epoch.
  * @return a Date object or undefined if time was not defined.
  */
 function toDate(time) {
   return time ? new Date(parseInt(time / 1000)) : undefined;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// LivemarkService
+// //////////////////////////////////////////////////////////////////////////////
+// // LivemarkService
 
 function LivemarkService() {
   // Cleanup on shutdown.
   Services.obs.addObserver(this, PlacesUtils.TOPIC_SHUTDOWN, true);
 
   // Observe bookmarks but don't init the service just for that.
   PlacesUtils.addLazyBookmarkObserver(this, true);
 }
@@ -144,18 +144,18 @@ LivemarkService.prototype = {
           return;
         }
       }
       // All livemarks have been reloaded.
       this._reloading = false;
     }, RELOAD_DELAY_MS, Ci.nsITimer.TYPE_ONE_SHOT);
   },
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsIObserver
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsIObserver
 
   observe(aSubject, aTopic, aData) {
     if (aTopic == PlacesUtils.TOPIC_SHUTDOWN) {
       if (this._reloadTimer) {
         this._reloading = false;
         this._reloadTimer.cancel();
         delete this._reloadTimer;
       }
@@ -164,18 +164,18 @@ LivemarkService.prototype = {
       this._promiseLivemarksMap().then(livemarksMap => {
         for (let livemark of livemarksMap.values()) {
           livemark.terminate();
         }
       });
     }
   },
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// mozIAsyncLivemarks
+  // ////////////////////////////////////////////////////////////////////////////
+  // // mozIAsyncLivemarks
 
   addLivemark(aLivemarkInfo) {
     if (!aLivemarkInfo) {
       throw new Components.Exception("Invalid arguments", Cr.NS_ERROR_INVALID_ARG);
     }
     let hasParentId = "parentId" in aLivemarkInfo;
     let hasParentGuid = "parentGuid" in aLivemarkInfo;
     let hasIndex = "index" in aLivemarkInfo;
@@ -307,18 +307,18 @@ LivemarkService.prototype = {
       let livemarksMap = yield this._promiseLivemarksMap();
       if (!livemarksMap.has(aLivemarkInfo.guid))
         throw new Components.Exception("Invalid livemark", Cr.NS_ERROR_INVALID_ARG);
 
       return livemarksMap.get(aLivemarkInfo.guid);
     }.bind(this));
   },
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsINavBookmarkObserver
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsINavBookmarkObserver
 
   onBeginUpdateBatch() {},
   onEndUpdateBatch() {},
   onItemVisited() {},
   onItemAdded() {},
 
   onItemChanged(id, property, isAnno, value, lastModified, itemType, parentId,
                 guid, parentGuid) {
@@ -359,18 +359,18 @@ LivemarkService.prototype = {
       if (livemarksMap.has(guid)) {
         let livemark = livemarksMap.get(guid);
         livemark.terminate();
         livemarksMap.delete(guid);
       }
     });
   },
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsINavHistoryObserver
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsINavHistoryObserver
 
   onPageChanged() {},
   onTitleChanged() {},
   onDeleteVisits() {},
 
   onClearHistory() {
     this._promiseLivemarksMap().then(livemarksMap => {
       for (let livemark of livemarksMap.values()) {
@@ -390,34 +390,34 @@ LivemarkService.prototype = {
   onVisit(aURI) {
     this._promiseLivemarksMap().then(livemarksMap => {
       for (let livemark of livemarksMap.values()) {
         livemark.updateURIVisitedStatus(aURI, true);
       }
     });
   },
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsISupports
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsISupports
 
   classID: Components.ID("{dca61eb5-c7cd-4df1-b0fb-d0722baba251}"),
 
   _xpcom_factory: XPCOMUtils.generateSingletonFactory(LivemarkService),
 
   QueryInterface: XPCOMUtils.generateQI([
     Ci.mozIAsyncLivemarks
   , Ci.nsINavBookmarkObserver
   , Ci.nsINavHistoryObserver
   , Ci.nsIObserver
   , Ci.nsISupportsWeakReference
   ])
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// Livemark
+// //////////////////////////////////////////////////////////////////////////////
+// // Livemark
 
 /**
  * Object used internally to represent a livemark.
  *
  * @param aLivemarkInfo
  *        Object containing information on the livemark.  If the livemark is
  *        not included in the object, a new livemark will be created.
  *
@@ -720,18 +720,18 @@ Livemark.prototype = {
     }
   },
 
   QueryInterface: XPCOMUtils.generateQI([
     Ci.mozILivemark
   ])
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// LivemarkLoadListener
+// //////////////////////////////////////////////////////////////////////////////
+// // LivemarkLoadListener
 
 /**
  * Object used internally to handle loading a livemark's contents.
  *
  * @param aLivemark
  *        The Livemark that is loading.
  */
 function LivemarkLoadListener(aLivemark) {
--- a/toolkit/components/places/nsPlacesExpiration.js
+++ b/toolkit/components/places/nsPlacesExpiration.js
@@ -26,18 +26,18 @@ const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
   "resource://gre/modules/PlacesUtils.jsm");
 
-////////////////////////////////////////////////////////////////////////////////
-//// Constants
+// //////////////////////////////////////////////////////////////////////////////
+// // Constants
 
 // Last expiration step should run before the final sync.
 const TOPIC_SHUTDOWN = "places-will-close-connection";
 const TOPIC_PREF_CHANGED = "nsPref:changed";
 const TOPIC_DEBUG_START_EXPIRATION = "places-debug-start-expiration";
 const TOPIC_EXPIRATION_FINISHED = "places-expiration-finished";
 const TOPIC_IDLE_BEGIN = "idle";
 const TOPIC_IDLE_END = "active";
@@ -448,23 +448,23 @@ const EXPIRATION_QUERIES = {
 function notify(observers, notification, args = []) {
   for (let observer of observers) {
     try {
       observer[notification](...args);
     } catch (ex) {}
   }
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// nsPlacesExpiration definition
+// //////////////////////////////////////////////////////////////////////////////
+// // nsPlacesExpiration definition
 
 function nsPlacesExpiration()
 {
-  //////////////////////////////////////////////////////////////////////////////
-  //// Smart Getters
+  // ////////////////////////////////////////////////////////////////////////////
+  // // Smart Getters
 
   XPCOMUtils.defineLazyGetter(this, "_db", function () {
     let db = Cc["@mozilla.org/browser/nav-history-service;1"].
              getService(Ci.nsPIPlacesDatabase).
              DBConnection;
 
     // Create the temporary notifications table.
     let stmt = db.createAsyncStatement(
@@ -503,18 +503,18 @@ function nsPlacesExpiration()
   // Register topic observers.
   Services.obs.addObserver(this, TOPIC_SHUTDOWN, true);
   Services.obs.addObserver(this, TOPIC_DEBUG_START_EXPIRATION, true);
   Services.obs.addObserver(this, TOPIC_IDLE_DAILY, true);
 }
 
 nsPlacesExpiration.prototype = {
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsIObserver
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsIObserver
 
   observe: function PEX_observe(aSubject, aTopic, aData)
   {
     if (this._shuttingDown) {
       return;
     }
 
     if (aTopic == TOPIC_SHUTDOWN) {
@@ -588,18 +588,18 @@ nsPlacesExpiration.prototype = {
     else if (aTopic == TOPIC_IDLE_DAILY) {
       this._expireWithActionAndLimit(ACTION.IDLE_DAILY, LIMIT.LARGE);
     }
     else if (aTopic == TOPIC_TESTING_MODE) {
       this._testingMode = true;
     }
   },
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsINavHistoryObserver
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsINavHistoryObserver
 
   _inBatchMode: false,
   onBeginUpdateBatch: function PEX_onBeginUpdateBatch()
   {
     this._inBatchMode = true;
 
     // We do not want to expire while we are doing batch work.
     if (this._timer) {
@@ -626,18 +626,18 @@ nsPlacesExpiration.prototype = {
   },
 
   onVisit: function() {},
   onTitleChanged: function() {},
   onDeleteURI: function() {},
   onPageChanged: function() {},
   onDeleteVisits: function() {},
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsITimerCallback
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsITimerCallback
 
   notify: function PEX_timerCallback()
   {
     // Check if we are over history capacity, if so visits must be expired.
     this._getPagesStats((function onPagesCount(aPagesCount, aStatsCount) {
       let overLimitPages = aPagesCount - this._urisLimit;
       this._overLimit = overLimitPages > 0;
 
@@ -651,18 +651,18 @@ nsPlacesExpiration.prototype = {
       // Adapt expiration aggressivity to the number of pages over the limit.
       let limit = overLimitPages > OVERLIMIT_PAGES_THRESHOLD ? LIMIT.LARGE
                                                              : LIMIT.SMALL;
 
       this._expireWithActionAndLimit(action, limit);
     }).bind(this));
   },
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// mozIStorageStatementCallback
+  // ////////////////////////////////////////////////////////////////////////////
+  // // mozIStorageStatementCallback
 
   handleResult: function PEX_handleResult(aResultSet)
   {
     // We don't want to notify after shutdown.
     if (this._shuttingDown)
       return;
 
     let row;
@@ -763,18 +763,18 @@ nsPlacesExpiration.prototype = {
         delete this._expectedResultsCount;
       }
 
       // Dispatch a notification that expiration has finished.
       Services.obs.notifyObservers(null, TOPIC_EXPIRATION_FINISHED, null);
     }
   },
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsPlacesExpiration
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsPlacesExpiration
 
   _urisLimit: PREF_MAX_URIS_NOTSET,
   _interval: PREF_INTERVAL_SECONDS_NOTSET,
   _shuttingDown: false,
 
   _status: STATUS.UNKNOWN,
   set status(aNewStatus) {
     if (aNewStatus != this._status) {
@@ -1087,29 +1087,29 @@ nsPlacesExpiration.prototype = {
                            Ci.nsITimer.TYPE_REPEATING_SLACK);
     if (this._testingMode) {
       Services.obs.notifyObservers(null, TOPIC_TEST_INTERVAL_CHANGED,
                                    interval);
     }
     return this._timer = timer;
   },
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsISupports
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsISupports
 
   classID: Components.ID("705a423f-2f69-42f3-b9fe-1517e0dee56f"),
 
   _xpcom_factory: XPCOMUtils.generateSingletonFactory(nsPlacesExpiration),
 
   QueryInterface: XPCOMUtils.generateQI([
     Ci.nsIObserver
   , Ci.nsINavHistoryObserver
   , Ci.nsITimerCallback
   , Ci.mozIStorageStatementCallback
   , Ci.nsISupportsWeakReference
   ])
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// Module Registration
+// //////////////////////////////////////////////////////////////////////////////
+// // Module Registration
 
 var components = [nsPlacesExpiration];
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);
--- a/toolkit/components/places/nsTaggingService.js
+++ b/toolkit/components/places/nsTaggingService.js
@@ -457,18 +457,18 @@ TaggingService.prototype = {
         PlacesUtils.tagsFolderId != aNewParent)
       delete this._tagFolders[aItemId];
   },
 
   onItemVisited: function () {},
   onBeginUpdateBatch: function () {},
   onEndUpdateBatch: function () {},
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsISupports
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsISupports
 
   classID: Components.ID("{bbc23860-2553-479d-8b78-94d9038334f7}"),
 
   _xpcom_factory: XPCOMUtils.generateSingletonFactory(TaggingService),
 
   QueryInterface: XPCOMUtils.generateQI([
     Ci.nsITaggingService
   , Ci.nsINavBookmarkObserver
@@ -690,18 +690,18 @@ TagAutoCompleteSearch.prototype = {
 
   /**
    * Stop an asynchronous search that is in progress
    */
   stopSearch: function PTACS_stopSearch() {
     this._stopped = true;
   },
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsISupports
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsISupports
 
   classID: Components.ID("{1dcc23b0-d4cb-11dc-9ad6-479d56d89593}"),
 
   _xpcom_factory: XPCOMUtils.generateSingletonFactory(TagAutoCompleteSearch),
 
   QueryInterface: XPCOMUtils.generateQI([
     Ci.nsIAutoCompleteSearch
   ])
--- a/toolkit/components/places/tests/bookmarks/test_savedsearches.js
+++ b/toolkit/components/places/tests/bookmarks/test_savedsearches.js
@@ -87,24 +87,24 @@ add_test(function test_savedsearches_boo
       // test that queries don't show themselves in query results (shouldn't have our saved search)
       do_check_eq(node.childCount, 1);
 
       // test that bookmark shows in query results
       var item = node.getChild(0);
       do_check_eq(item.itemId, bookmarkId);
 
       // XXX - FAILING - test live-update of query results - add a bookmark that matches the query
-      //var tmpBmId = PlacesUtils.bookmarks.insertBookmark(
+      // var tmpBmId = PlacesUtils.bookmarks.insertBookmark(
       //  root, uri("http://" + searchTerm + ".com"),
       //  PlacesUtils.bookmarks.DEFAULT_INDEX, searchTerm + "blah");
-      //do_check_eq(query.childCount, 2);
+      // do_check_eq(query.childCount, 2);
 
       // XXX - test live-update of query results - delete a bookmark that matches the query
-      //PlacesUtils.bookmarks.removeItem(tmpBMId);
-      //do_check_eq(query.childCount, 1);
+      // PlacesUtils.bookmarks.removeItem(tmpBMId);
+      // do_check_eq(query.childCount, 1);
 
       // test live-update of query results - add a folder that matches the query
       PlacesUtils.bookmarks.createFolder(
         root, searchTerm + "zaa", PlacesUtils.bookmarks.DEFAULT_INDEX);
       do_check_eq(node.childCount, 1);
       // test live-update of query results - add a query that matches the query
       PlacesUtils.bookmarks.insertBookmark(
         root, uri("place:terms=foo&excludeQueries=1&expandQueries=1&queryType=1"),
--- a/toolkit/components/places/tests/browser/browser_bug680727.js
+++ b/toolkit/components/places/tests/browser/browser_bug680727.js
@@ -33,17 +33,17 @@ function test() {
   BrowserTestUtils.openNewForegroundTab(gBrowser).then(tab => {
     ourTab = tab;
     BrowserTestUtils.waitForContentEvent(ourTab.linkedBrowser, "DOMContentLoaded")
                     .then(errorListener);
     BrowserTestUtils.loadURI(ourTab.linkedBrowser, kUniqueURI.spec);
   });
 }
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // listen to loading the neterror page. (offline mode)
 function errorListener() {
   ok(Services.io.offline, "Services.io.offline is true.");
 
   // This is an error page.
   ContentTask.spawn(ourTab.linkedBrowser, kUniqueURI.spec, function(uri) {
     Assert.equal(content.document.documentURI.substring(0, 27),
       "about:neterror?e=netOffline", "Document URI is the error page.");
@@ -72,17 +72,17 @@ function errorAsyncListener(aURI, aIsVis
 
   ContentTask.spawn(ourTab.linkedBrowser, null, function() {
     Assert.ok(content.document.getElementById("errorTryAgain"),
       "The error page has got a #errorTryAgain element");
     content.document.getElementById("errorTryAgain").click();
   });
 }
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // listen to reload of neterror.
 function reloadListener() {
   // This listener catches "DOMContentLoaded" on being called
   // nsIWPL::onLocationChange(...). That is right *AFTER*
   // IHistory::VisitURI(...) is called.
   ok(!Services.io.offline, "Services.io.offline is false.");
 
   ContentTask.spawn(ourTab.linkedBrowser, kUniqueURI.spec, function(uri) {
--- a/toolkit/components/places/tests/browser/browser_colorAnalyzer.js
+++ b/toolkit/components/places/tests/browser/browser_colorAnalyzer.js
@@ -89,17 +89,17 @@ add_task(function* test_redGradientBlueS
   }, function(actual, message) {
     ok(actual >= 0xFF0000 && actual <= 0xFF0808, message);
   }, "redGradientBlueSolid analysis returns redish");
 });
 
 // try a transparent image, should fail
 add_task(function* test_transparent() {
   yield canvasTest(16, 16, function(ctx) {
-    //do nothing!
+    // do nothing!
   }, null, "transparent analysis fails");
 });
 
 add_task(function* test_invalidURI() {
   yield frcTest("data:blah,Imnotavaliddatauri", null, "invalid URI analysis fails");
 });
 
 add_task(function* test_malformedPNGURI() {
--- a/toolkit/components/places/tests/browser/browser_favicon_setAndFetchFaviconForPage_failures.js
+++ b/toolkit/components/places/tests/browser/browser_favicon_setAndFetchFaviconForPage_failures.js
@@ -45,17 +45,17 @@ function test() {
         for (let row; (row = aResultSet.getNextRow()); ) {
           favIconsResultCount++;
         }
       },
       handleError: function final_handleError(aError) {
         throw ("Unexpected error (" + aError.result + "): " + aError.message);
       },
       handleCompletion: function final_handleCompletion(aReason) {
-        //begin testing
+        // begin testing
         info("Previous records in moz_favicons: " + favIconsResultCount);
         if (aCallback) {
           aCallback();
         }
       }
     });
     stmt.finalize();
   }
--- a/toolkit/components/places/tests/expiration/test_analyze_runs.js
+++ b/toolkit/components/places/tests/expiration/test_analyze_runs.js
@@ -1,18 +1,18 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-////////////////////////////////////////////////////////////////////////////////
-//// Constants
+// //////////////////////////////////////////////////////////////////////////////
+// // Constants
 
 const TOPIC_AUTOCOMPLETE_FEEDBACK_INCOMING = "autocomplete-will-enter-text";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Helpers
+// //////////////////////////////////////////////////////////////////////////////
+// // Helpers
 
 /**
  * Ensures that we have no data in the tables created by ANALYZE.
  */
 function clearAnalyzeData() {
   let db = DBConn();
   if (!db.tableExists("sqlite_stat1")) {
     return;
@@ -42,18 +42,18 @@ function do_check_analyze_ran(aTableName
       do_check_false(stmt.executeStep());
     }
   }
   finally {
     stmt.finalize();
   }
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Tests
+// //////////////////////////////////////////////////////////////////////////////
+// // Tests
 
 function run_test() {
   run_next_test();
 }
 
 add_task(function* init_tests() {
   const TEST_URI = NetUtil.newURI("http://mozilla.org/");
   const TEST_TITLE = "This is a test";
--- a/toolkit/components/places/tests/favicons/test_favicons_conversions.js
+++ b/toolkit/components/places/tests/favicons/test_favicons_conversions.js
@@ -1,17 +1,17 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * This file tests the image conversions done by the favicon service.
  */
 
-////////////////////////////////////////////////////////////////////////////////
-/// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// / Globals
 
 // The pixel values we get on Windows are sometimes +/- 1 value compared to
 // other platforms, so we need to skip some image content tests.
 var isWindows = ("@mozilla.org/windows-registry-key;1" in Cc);
 
 /**
  * Checks the conversion of the given test image file.
  *
@@ -55,18 +55,18 @@ function checkFaviconDataConversion(aFil
             do_check_eq(aMimeType, "image/png");
           }
 
           aCallback();
         }, Services.scriptSecurityManager.getSystemPrincipal());
     });
 }
 
-////////////////////////////////////////////////////////////////////////////////
-/// Tests
+// //////////////////////////////////////////////////////////////////////////////
+// / Tests
 
 function run_test() {
   run_next_test();
 }
 
 add_test(function test_storing_a_normal_16x16_icon() {
   // 16x16 png, 286 bytes.
   // optimized: no
--- a/toolkit/components/places/tests/favicons/test_getFaviconDataForPage.js
+++ b/toolkit/components/places/tests/favicons/test_getFaviconDataForPage.js
@@ -1,24 +1,24 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * This file tests getFaviconDataForPage.
  */
 
-////////////////////////////////////////////////////////////////////////////////
-/// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// / Globals
 
 const FAVICON_URI = NetUtil.newURI(do_get_file("favicon-normal32.png"));
 const FAVICON_DATA = readFileData(do_get_file("favicon-normal32.png"));
 const FAVICON_MIMETYPE = "image/png";
 
-////////////////////////////////////////////////////////////////////////////////
-/// Tests
+// //////////////////////////////////////////////////////////////////////////////
+// / Tests
 
 function run_test()
 {
   // Check that the favicon loaded correctly before starting the actual tests.
   do_check_eq(FAVICON_DATA.length, 344);
   run_next_test();
 }
 
--- a/toolkit/components/places/tests/favicons/test_getFaviconURLForPage.js
+++ b/toolkit/components/places/tests/favicons/test_getFaviconURLForPage.js
@@ -1,17 +1,17 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * This file tests getFaviconURLForPage.
  */
 
-////////////////////////////////////////////////////////////////////////////////
-/// Tests
+// //////////////////////////////////////////////////////////////////////////////
+// / Tests
 
 function run_test()
 {
   run_next_test();
 }
 
 add_test(function test_normal()
 {
--- a/toolkit/components/places/tests/favicons/test_moz-anno_favicon_mime_type.js
+++ b/toolkit/components/places/tests/favicons/test_moz-anno_favicon_mime_type.js
@@ -4,25 +4,25 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
  * This test ensures that the mime type is set for moz-anno channels of favicons
  * properly.  Added with work in bug 481227.
  */
 
-////////////////////////////////////////////////////////////////////////////////
-//// Constants
+// //////////////////////////////////////////////////////////////////////////////
+// // Constants
 Cu.import("resource://gre/modules/NetUtil.jsm");
 
 const testFaviconData = "data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%10%00%00%00%10%08%06%00%00%00%1F%F3%FFa%00%00%00%04gAMA%00%00%AF%C87%05%8A%E9%00%00%00%19tEXtSoftware%00Adobe%20ImageReadyq%C9e%3C%00%00%01%D6IDATx%DAb%FC%FF%FF%3F%03%25%00%20%80%98%909%EF%DF%BFg%EF%EC%EC%FC%AD%AC%AC%FC%DF%95%91%F1%BF%89%89%C9%7F%20%FF%D7%EA%D5%AB%B7%DF%BBwO%16%9B%01%00%01%C4%00r%01%08%9F9s%C6%CD%D8%D8%F8%BF%0B%03%C3%FF3%40%BC%0A%88%EF%02q%1A%10%BB%40%F1%AAU%ABv%C1%D4%C30%40%00%81%89%993g%3E%06%1A%F6%3F%14%AA%11D%97%03%F1%7Fc%08%0D%E2%2B))%FD%17%04%89%A1%19%00%10%40%0C%D00%F8%0F3%00%C8%F8%BF%1B%E4%0Ac%88a%E5%60%17%19%FF%0F%0D%0D%05%1B%02v%D9%DD%BB%0A0%03%00%02%08%AC%B9%A3%A3%E3%17%03%D4v%90%01%EF%18%106%C3%0Cz%07%C5%BB%A1%DE%82y%07%20%80%A0%A6%08B%FCn%0C1%60%26%D4%20d%C3VA%C3%06%26%BE%0A%EA-%80%00%82%B9%E0%F7L4%0D%EF%90%F8%C6%60%2F%0A%82%BD%01%13%07%0700%D0%01%02%88%11%E4%02P%B41%DC%BB%C7%D0%014%0D%E8l%06W%20%06%BA%88%A1%1C%1AS%15%40%7C%16%CA6.%2Fgx%BFg%0F%83%CB%D9%B3%0C%7B%80%7C%80%00%02%BB%00%E8%9F%ED%20%1B%3A%A0%A6%9F%81%DA%DC%01%C5%B0%80%ED%80%FA%BF%BC%BC%FC%3F%83%12%90%9D%96%F6%1F%20%80%18%DE%BD%7B%C7%0E%8E%05AD%20%FEGr%A6%A0%A0%E0%7F%25P%80%02%9D%0F%D28%13%18%23%C6%C0%B0%02E%3D%C8%F5%00%01%04%8F%05P%A8%BA%40my%87%E4%12c%A8%8D%20%8B%D0%D3%00%08%03%04%10%9C%01R%E4%82d%3B%C8%A0%99%C6%90%90%C6%A5%19%84%01%02%08%9E%17%80%C9x%F7%7B%A0%DBVC%F9%A0%C0%5C%7D%16%2C%CE%00%F4%C6O%5C%99%09%20%800L%04y%A5%03%1A%95%A0%80%05%05%14.%DBA%18%20%80%18)%CD%CE%00%01%06%00%0C'%94%C7%C0k%C9%2C%00%00%00%00IEND%AEB%60%82";
 const moz_anno_favicon_prefix = "moz-anno:favicon:";
 
-////////////////////////////////////////////////////////////////////////////////
-//// streamListener
+// //////////////////////////////////////////////////////////////////////////////
+// // streamListener
 
 function streamListener(aExpectedContentType)
 {
   this._expectedContentType = aExpectedContentType;
 }
 streamListener.prototype =
 {
   onStartRequest: function(aRequest, aContext)
@@ -43,18 +43,18 @@ streamListener.prototype =
     do_test_finished();
   },
   onDataAvailable: function(aRequest, aContext, aInputStream, aOffset, aCount)
   {
     aRequest.cancel(Cr.NS_ERROR_ABORT);
   }
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// Test Runner
+// //////////////////////////////////////////////////////////////////////////////
+// // Test Runner
 
 function run_test()
 {
   let fs = Cc["@mozilla.org/browser/favicon-service;1"].
            getService(Ci.nsIFaviconService);
   let ios = Cc["@mozilla.org/network/io-service;1"].
             getService(Ci.nsIIOService);
 
--- a/toolkit/components/places/tests/history/test_remove.js
+++ b/toolkit/components/places/tests/history/test_remove.js
@@ -315,17 +315,17 @@ add_task(function* test_error_cases() {
     "History.remove with an array containing null should throw a TypeError"
   );
   Assert.throws(
     () => PlacesUtils.history.remove(["http://example.org", "not a guid, obviously"]),
     /TypeError: .* is not a valid URL/,
     "History.remove with an array containing an ill-formed guid/url argument should throw a TypeError"
   );
   Assert.throws(
-    () => PlacesUtils.history.remove(["0123456789ab"/*valid guid*/, null]),
+    () => PlacesUtils.history.remove(["0123456789ab"/* valid guid*/, null]),
     /TypeError: Invalid url or guid: null/,
     "History.remove with an array containing a guid and a second argument that is null should throw a TypeError"
   );
   Assert.throws(
     () => PlacesUtils.history.remove(["http://example.org", {"not the kind of object we know how to handle": true}]),
     /TypeError: Invalid url/,
     "History.remove with an array containing an unexpected objecgt should throw a TypeError"
   );
--- a/toolkit/components/places/tests/network/test_history_redirects.js
+++ b/toolkit/components/places/tests/network/test_history_redirects.js
@@ -49,17 +49,17 @@ function foundHandler(aMeta, aResponse) 
 
 function PathHandler(aMeta, aResponse, aChannelEvent, aRedirURL) {
   aResponse.setStatusLine(aMeta.httpVersion,
                           STATUS[aChannelEvent][0],   // Code
                           STATUS[aChannelEvent][1]);  // Text
   if (aRedirURL)
     aResponse.setHeader("Location", aRedirURL, false);
 
-  //aResponse.setHeader("Content-Type", "text/html", false);
+  // aResponse.setHeader("Content-Type", "text/html", false);
   let body = STATUS[aChannelEvent][1] + "\r\n";
   aResponse.bodyOutputStream.write(body, body.length);
 }
 
 function run_test() {
   do_test_pending();
 
   var chan = NetUtil.newChannel({
--- a/toolkit/components/places/tests/queries/head_queries.js
+++ b/toolkit/components/places/tests/queries/head_queries.js
@@ -276,17 +276,17 @@ function compareArrayToResult(aArray, aR
     }
   }
   do_check_eq(expectedResultCount, aRoot.childCount);
 
   var inQueryIndex = 0;
   for (var i = 0; i < aArray.length; i++) {
     if (aArray[i].isInQuery) {
       var child = aRoot.getChild(inQueryIndex);
-      //do_print("testing testData[" + i + "] vs result[" + inQueryIndex + "]");
+      // do_print("testing testData[" + i + "] vs result[" + inQueryIndex + "]");
       if (!aArray[i].isFolder && !aArray[i].isSeparator) {
         do_print("testing testData[" + aArray[i].uri + "] vs result[" + child.uri + "]");
         if (aArray[i].uri != child.uri) {
           dump_table("moz_places");
           do_throw("Expected " + aArray[i].uri + " found " + child.uri);
         }
       }
       if (!aArray[i].isSeparator && aArray[i].title != child.title)
--- a/toolkit/components/places/tests/queries/test_abstime-annotation-domain.js
+++ b/toolkit/components/places/tests/queries/test_abstime-annotation-domain.js
@@ -74,17 +74,17 @@ var testData = [
   // Test https protocol
   {isInQuery: true, isVisit: true, isDetails: true, title: "moz",
    uri: "https://foo.com/", lastVisit: jan15_2045},
 
   // Test begin edge of time
   {isInQuery: true, isVisit: true, isDetails: true, title: "moz mozilla",
    uri: "https://foo.com/begin.html", lastVisit: beginTime},
 
-  //Test end edge of time
+  // Test end edge of time
   {isInQuery: true, isVisit: true, isDetails: true, title: "moz mozilla",
    uri: "https://foo.com/end.html", lastVisit: endTime},
 
   // Test an image link, with annotations
   {isInQuery: true, isVisit: true, isDetails: true, isPageAnnotation: true,
    title: "mozzie the dino", uri: "https://foo.com/mozzie.png",
    annoName: goodAnnoName, annoVal: val, lastVisit: jan14_2130},
 
@@ -122,17 +122,17 @@ var testData = [
  */
 function run_test()
 {
   run_next_test();
 }
 
 add_task(function* test_abstime_annotation_domain()
 {
-  //Initialize database
+  // Initialize database
   yield task_populateDB(testData);
 
   // Query
   var query = PlacesUtils.history.getNewQuery();
   query.beginTime = beginTime;
   query.endTime = endTime;
   query.beginTimeReference = PlacesUtils.history.TIME_RELATIVE_EPOCH;
   query.endTimeReference = PlacesUtils.history.TIME_RELATIVE_EPOCH;
@@ -174,32 +174,32 @@ add_task(function* test_abstime_annotati
   do_check_eq(isInResult(change1, root), true);
 
   // Let's update something by annotation
   // Updating a page by removing an annotation does not cause it to join this
   // query set.  I tend to think that it should cause that page to join this
   // query set, because this visit fits all theother specified criteria once the
   // annotation is removed. Uncommenting this will fail the test.
   // Bug 424050
-  /*var change2 = [{isPageAnnotation: true, uri: "http://foo.com/badannotaion.html",
+  /* var change2 = [{isPageAnnotation: true, uri: "http://foo.com/badannotaion.html",
                   annoName: "text/mozilla", annoVal: "test"}];
   yield task_populateDB(change2);
   do_print("LiveUpdate by removing annotation");
   do_check_eq(isInResult(change2, root), true);*/
 
   // Let's update by adding a visit in the time range for an existing URI
   var change3 = [{isDetails: true, uri: "http://foo.com/changeme3.htm",
                   title: "moz", lastVisit: jan15_2045}];
   yield task_populateDB(change3);
   do_print("LiveUpdate by adding visit within timerange");
   do_check_eq(isInResult(change3, root), true);
 
   // And delete something from the result set - using annotation
   // Once again, bug 424050 prevents this from passing
-  /*var change4 = [{isPageAnnotation: true, uri: "ftp://foo.com/ftp",
+  /* var change4 = [{isPageAnnotation: true, uri: "ftp://foo.com/ftp",
                   annoVal: "test", annoName: badAnnoName}];
   yield task_populateDB(change4);
   do_print("LiveUpdate by deleting item from set by adding annotation");
   do_check_eq(isInResult(change4, root), false);*/
 
   // Delete something by changing the title
   var change5 = [{isDetails: true, uri: "http://foo.com/end.html", title: "deleted"}];
   yield task_populateDB(change5);
--- a/toolkit/components/places/tests/queries/test_abstime-annotation-uri.js
+++ b/toolkit/components/places/tests/queries/test_abstime-annotation-uri.js
@@ -102,17 +102,17 @@ var testData = [
  */
 function run_test()
 {
   run_next_test();
 }
 
 add_task(function* test_abstime_annotation_uri()
 {
-  //Initialize database
+  // Initialize database
   yield task_populateDB(testData);
 
   // Query
   var query = PlacesUtils.history.getNewQuery();
   query.beginTime = beginTime;
   query.endTime = endTime;
   query.beginTimeReference = PlacesUtils.history.TIME_RELATIVE_EPOCH;
   query.endTimeReference = PlacesUtils.history.TIME_RELATIVE_EPOCH;
--- a/toolkit/components/places/tests/queries/test_containersQueries_sorting.js
+++ b/toolkit/components/places/tests/queries/test_containersQueries_sorting.js
@@ -7,18 +7,18 @@
 /**
  * Testing behavior of bug 473157
  * "Want to sort history in container view without sorting the containers"
  * and regression bug 488783
  * Tags list no longer sorted (alphabetized).
  * This test is for global testing sorting containers queries.
  */
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals and Constants
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals and Constants
 
 var hs = Cc["@mozilla.org/browser/nav-history-service;1"].
          getService(Ci.nsINavHistoryService);
 var bh = hs.QueryInterface(Ci.nsIBrowserHistory);
 var tagging = Cc["@mozilla.org/browser/tagging-service;1"].
               getService(Ci.nsITaggingService);
 
 var resultTypes = [
@@ -49,18 +49,18 @@ var pages = [
 ];
 
 var tags = [
   "mozilla",
   "Development",
   "test",
 ];
 
-////////////////////////////////////////////////////////////////////////////////
-//// Test Runner
+// //////////////////////////////////////////////////////////////////////////////
+// // Test Runner
 
 /**
  * Enumerates all the sequences of the cartesian product of the arrays contained
  * in aSequences.  Examples:
  *
  *   cartProd([[1, 2, 3], ["a", "b"]], callback);
  *   // callback is called 3 * 2 = 6 times with the following arrays:
  *   // [1, "a"], [1, "b"], [2, "a"], [2, "b"], [3, "a"], [3, "b"]
@@ -376,18 +376,18 @@ function check_children_sorting(aRootNod
   for (let i = 0; i < sortedResults.length; i++) {
     if (sortedResults[i].title != results[i].title)
       print(i + " index wrong, expected " + sortedResults[i].title +
             " found " + results[i].title);
     do_check_eq(sortedResults[i].title, results[i].title);
   }
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Main
+// //////////////////////////////////////////////////////////////////////////////
+// // Main
 
 function run_test()
 {
   run_next_test();
 }
 
 add_task(function* test_containersQueries_sorting()
 {
--- a/toolkit/components/places/tests/queries/test_onlyBookmarked.js
+++ b/toolkit/components/places/tests/queries/test_onlyBookmarked.js
@@ -74,24 +74,24 @@ add_task(function* test_onlyBookmarked()
   compareArrayToResult(testData, root);
   do_print("end first test");
 
   /* ******************
   Test live-update
   ********************/
 
   var liveUpdateTestData = [
-    //Add a bookmark that should show up
+    // Add a bookmark that should show up
     { isBookmark: true,
       uri: "http://bookmarked2.com/",
       parentGuid: PlacesUtils.bookmarks.toolbarGuid,
       index: PlacesUtils.bookmarks.DEFAULT_INDEX,
       isInQuery: true },
 
-    //Add a bookmark that should not show up
+    // Add a bookmark that should not show up
     { isBookmark: true,
       uri: "http://bookmarked-elsewhere2.com/",
       parentGuid: PlacesUtils.bookmarks.menuGuid,
       index: PlacesUtils.bookmarks.DEFAULT_INDEX,
       isInQuery: false }
   ];
 
   yield task_populateDB(liveUpdateTestData); // add to the db
--- a/toolkit/components/places/tests/queries/test_querySerialization.js
+++ b/toolkit/components/places/tests/queries/test_querySerialization.js
@@ -453,17 +453,17 @@ const queryOptionSwitches = [
       },
       function (aQuery, aQueryOptions) {
         aQueryOptions.queryType = aQueryOptions.QUERY_TYPE_UNIFIED;
       }
     ]
   },
 ];
 
-///////////////////////////////////////////////////////////////////////////////
+// /////////////////////////////////////////////////////////////////////////////
 
 /**
  * Enumerates all the sequences of the cartesian product of the arrays contained
  * in aSequences.  Examples:
  *
  *   cartProd([[1, 2, 3], ["a", "b"]], callback);
  *   // callback is called 3 * 2 = 6 times with the following arrays:
  *   // [1, "a"], [1, "b"], [2, "a"], [2, "b"], [3, "a"], [3, "b"]
@@ -789,14 +789,14 @@ function serializeDeserialize(aQueryArr,
  *         another nsINavHistoryQuery or nsINavHistoryQueryOptions object
  * @return true if this switch is the same in both aObj1 and aObj2
  */
 function simplePropertyMatches(aObj1, aObj2)
 {
   return aObj1[this.property] === aObj2[this.property];
 }
 
-///////////////////////////////////////////////////////////////////////////////
+// /////////////////////////////////////////////////////////////////////////////
 
 function run_test()
 {
   runQuerySequences(CHOOSE_HOW_MANY_SWITCHES_LO, CHOOSE_HOW_MANY_SWITCHES_HI);
 }
--- a/toolkit/components/places/tests/queries/test_redirects.js
+++ b/toolkit/components/places/tests/queries/test_redirects.js
@@ -197,17 +197,17 @@ add_task(function* test_add_visits_to_da
 
   // Array of all possible transition types we could be redirected from.
   let t = [
     Ci.nsINavHistoryService.TRANSITION_LINK,
     Ci.nsINavHistoryService.TRANSITION_TYPED,
     Ci.nsINavHistoryService.TRANSITION_BOOKMARK,
     // Embed visits are not added to the database and we don't want redirects
     // to them, thus just avoid addition.
-    //Ci.nsINavHistoryService.TRANSITION_EMBED,
+    // Ci.nsINavHistoryService.TRANSITION_EMBED,
     Ci.nsINavHistoryService.TRANSITION_FRAMED_LINK,
     // Would make hard sorting by visit date because last_visit_date is actually
     // calculated excluding download transitions, but the query includes
     // downloads.
     // TODO: Bug 488966 could fix this behavior.
     //Ci.nsINavHistoryService.TRANSITION_DOWNLOAD,
   ];
 
--- a/toolkit/components/places/tests/queries/test_sorting.js
+++ b/toolkit/components/places/tests/queries/test_sorting.js
@@ -1,17 +1,17 @@
 /* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
 /* vim:set ts=2 sw=2 sts=2 et: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 var tests = [];
 
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
 
 tests.push({
   _sortingMode: Ci.nsINavHistoryQueryOptions.SORT_BY_NONE,
 
   *setup() {
     do_print("Sorting test 1: SORT BY NONE");
 
     this._unsortedData = [
@@ -64,17 +64,17 @@ tests.push({
     root.containerOpen = false;
   },
 
   check_reverse: function() {
     // no reverse sorting for SORT BY NONE
   }
 });
 
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
 
 tests.push({
   _sortingMode: Ci.nsINavHistoryQueryOptions.SORT_BY_TITLE_ASCENDING,
 
   *setup() {
     do_print("Sorting test 2: SORT BY TITLE");
 
     this._unsortedData = [
@@ -139,17 +139,17 @@ tests.push({
 
   check_reverse: function() {
     this._sortingMode = Ci.nsINavHistoryQueryOptions.SORT_BY_TITLE_DESCENDING;
     this._sortedData.reverse();
     this.check();
   }
 });
 
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
 
 tests.push({
   _sortingMode: Ci.nsINavHistoryQueryOptions.SORT_BY_DATE_ASCENDING,
 
   *setup() {
     do_print("Sorting test 3: SORT BY DATE");
 
     var timeInMicroseconds = Date.now() * 1000;
@@ -239,17 +239,17 @@ tests.push({
 
   check_reverse: function() {
     this._sortingMode = Ci.nsINavHistoryQueryOptions.SORT_BY_DATE_DESCENDING;
     this._sortedData.reverse();
     this.check();
   }
 });
 
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
 
 tests.push({
   _sortingMode: Ci.nsINavHistoryQueryOptions.SORT_BY_URI_ASCENDING,
 
   *setup() {
     do_print("Sorting test 4: SORT BY URI");
 
     var timeInMicroseconds = Date.now() * 1000;
@@ -345,17 +345,17 @@ tests.push({
 
   check_reverse: function() {
     this._sortingMode = Ci.nsINavHistoryQueryOptions.SORT_BY_URI_DESCENDING;
     this._sortedData.reverse();
     this.check();
   }
 });
 
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
 
 tests.push({
   _sortingMode: Ci.nsINavHistoryQueryOptions.SORT_BY_VISITCOUNT_ASCENDING,
 
   *setup() {
     do_print("Sorting test 5: SORT BY VISITCOUNT");
 
     var timeInMicroseconds = Date.now() * 1000;
@@ -446,17 +446,17 @@ tests.push({
 
   check_reverse: function() {
     this._sortingMode = Ci.nsINavHistoryQueryOptions.SORT_BY_VISITCOUNT_DESCENDING;
     this._sortedData.reverse();
     this.check();
   }
 });
 
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
 
 tests.push({
   _sortingMode: Ci.nsINavHistoryQueryOptions.SORT_BY_KEYWORD_ASCENDING,
 
   *setup() {
     do_print("Sorting test 6: SORT BY KEYWORD");
 
     this._unsortedData = [
@@ -545,17 +545,17 @@ tests.push({
 
   check_reverse: function() {
     this._sortingMode = Ci.nsINavHistoryQueryOptions.SORT_BY_KEYWORD_DESCENDING;
     this._sortedData.reverse();
     this.check();
   }
 });
 
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
 
 tests.push({
   _sortingMode: Ci.nsINavHistoryQueryOptions.SORT_BY_DATEADDED_ASCENDING,
 
   *setup() {
     do_print("Sorting test 7: SORT BY DATEADDED");
 
     var timeInMicroseconds = Date.now() * 1000;
@@ -635,17 +635,17 @@ tests.push({
 
   check_reverse: function() {
     this._sortingMode = Ci.nsINavHistoryQueryOptions.SORT_BY_DATEADDED_DESCENDING;
     this._sortedData.reverse();
     this.check();
   }
 });
 
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
 
 tests.push({
   _sortingMode: Ci.nsINavHistoryQueryOptions.SORT_BY_LASTMODIFIED_ASCENDING,
 
   *setup() {
     do_print("Sorting test 8: SORT BY LASTMODIFIED");
 
     var timeInMicroseconds = Date.now() * 1000;
@@ -733,17 +733,17 @@ tests.push({
 
   check_reverse: function() {
     this._sortingMode = Ci.nsINavHistoryQueryOptions.SORT_BY_LASTMODIFIED_DESCENDING;
     this._sortedData.reverse();
     this.check();
   }
 });
 
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
 
 tests.push({
   _sortingMode: Ci.nsINavHistoryQueryOptions.SORT_BY_TAGS_ASCENDING,
 
   *setup() {
     do_print("Sorting test 9: SORT BY TAGS");
 
     this._unsortedData = [
@@ -833,17 +833,17 @@ tests.push({
 
   check_reverse: function() {
     this._sortingMode = Ci.nsINavHistoryQueryOptions.SORT_BY_TAGS_DESCENDING;
     this._sortedData.reverse();
     this.check();
   }
 });
 
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
 // SORT_BY_ANNOTATION_* (int32)
 
 tests.push({
   _sortingMode: Ci.nsINavHistoryQueryOptions.SORT_BY_ANNOTATION_ASCENDING,
 
   *setup() {
     do_print("Sorting test 10: SORT BY ANNOTATION (int32)");
 
@@ -929,17 +929,17 @@ tests.push({
 
   check_reverse: function() {
     this._sortingMode = Ci.nsINavHistoryQueryOptions.SORT_BY_ANNOTATION_DESCENDING;
     this._sortedData.reverse();
     this.check();
   }
 });
 
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
 // SORT_BY_ANNOTATION_* (int64)
 
 tests.push({
   _sortingMode: Ci.nsINavHistoryQueryOptions.SORT_BY_ANNOTATION_ASCENDING,
 
   *setup() {
     do_print("Sorting test 11: SORT BY ANNOTATION (int64)");
 
@@ -1011,17 +1011,17 @@ tests.push({
 
   check_reverse: function() {
     this._sortingMode = Ci.nsINavHistoryQueryOptions.SORT_BY_ANNOTATION_DESCENDING;
     this._sortedData.reverse();
     this.check();
   }
 });
 
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
 // SORT_BY_ANNOTATION_* (string)
 
 tests.push({
   _sortingMode: Ci.nsINavHistoryQueryOptions.SORT_BY_ANNOTATION_ASCENDING,
 
   *setup() {
     do_print("Sorting test 12: SORT BY ANNOTATION (string)");
 
@@ -1093,17 +1093,17 @@ tests.push({
 
   check_reverse: function() {
     this._sortingMode = Ci.nsINavHistoryQueryOptions.SORT_BY_ANNOTATION_DESCENDING;
     this._sortedData.reverse();
     this.check();
   }
 });
 
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
 // SORT_BY_ANNOTATION_* (double)
 
 tests.push({
   _sortingMode: Ci.nsINavHistoryQueryOptions.SORT_BY_ANNOTATION_ASCENDING,
 
   *setup() {
     do_print("Sorting test 13: SORT BY ANNOTATION (double)");
 
@@ -1175,17 +1175,17 @@ tests.push({
 
   check_reverse: function() {
     this._sortingMode = Ci.nsINavHistoryQueryOptions.SORT_BY_ANNOTATION_DESCENDING;
     this._sortedData.reverse();
     this.check();
   }
 });
 
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
 // SORT_BY_FRECENCY_*
 
 tests.push({
   _sortingMode: Ci.nsINavHistoryQueryOptions.SORT_BY_FRECENCY_ASCENDING,
 
   *setup() {
     do_print("Sorting test 13: SORT BY FRECENCY ");
 
@@ -1263,17 +1263,17 @@ tests.push({
 
   check_reverse: function() {
     this._sortingMode = Ci.nsINavHistoryQueryOptions.SORT_BY_FRECENCY_DESCENDING;
     this._sortedData.reverse();
     this.check();
   }
 });
 
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
 
 function run_test()
 {
   run_next_test();
 }
 
 add_task(function* test_sorting()
 {
--- a/toolkit/components/places/tests/queries/test_tags.js
+++ b/toolkit/components/places/tests/queries/test_tags.js
@@ -529,17 +529,17 @@ add_task(function* ORed_queries() {
 
 // The tag keys in query URIs, i.e., "place:tag=foo&!tags=1"
 //                                          ---     -----
 const QUERY_KEY_TAG      = "tag";
 const QUERY_KEY_NOT_TAGS = "!tags";
 
 const TEST_URI = uri("http://example.com/");
 
-///////////////////////////////////////////////////////////////////////////////
+// /////////////////////////////////////////////////////////////////////////////
 
 /**
  * Adds a bookmark.
  *
  * @param aURI
  *        URI of the page (an nsIURI)
  */
 function addBookmark(aURI) {
@@ -621,17 +621,17 @@ function* task_doWithVisit(aTags, aCallb
  * function takes care of all of that.
  *
  * @param  aTag
  *         A tag name to encode
  * @return A UTF-8 escaped string suitable for inclusion in a query URI
  */
 function encodeTag(aTag) {
   return encodeURIComponent(aTag).
-         replace(/[-_.!~*'()]/g, //'
+         replace(/[-_.!~*'()]/g, // '
                  s => "%" + s.charCodeAt(0).toString(16));
 }
 
 /**
  * Executes the given query and compares the results to the given URIs.
  * See queryResultsAre().
  *
  * @param aQuery
@@ -735,13 +735,13 @@ function setsAreEqual(aArr1, aArr2, aIsO
     }
   }
   else {
     aArr1.forEach(u => do_check_true(aArr2.indexOf(u) >= 0));
     aArr2.forEach(u => do_check_true(aArr1.indexOf(u) >= 0));
   }
 }
 
-///////////////////////////////////////////////////////////////////////////////
+// /////////////////////////////////////////////////////////////////////////////
 
 function run_test() {
   run_next_test();
 }
--- a/toolkit/components/places/tests/queries/test_transitions.js
+++ b/toolkit/components/places/tests/queries/test_transitions.js
@@ -100,18 +100,18 @@ add_task(function* test_transitions()
     yield PlacesTestUtils.addVisits({
       uri: uri(item.uri),
       transition: item.transType,
       visitDate: timeNow++ * 1000,
       title: item.title
     });
   }
 
-  //dump_table("moz_places");
-  //dump_table("moz_historyvisits");
+  // dump_table("moz_places");
+  // dump_table("moz_historyvisits");
 
   var numSortFunc = function (a, b) { return (a - b); };
   var arrs = testDataTyped.concat(testDataDownload).concat(testDataBookmark)
               .sort(numSortFunc);
 
   // Four tests which compare the result of a query to an expected set.
   var data = arrs.filter(function (index) {
       return (testData[index].uri.match(/arewefastyet\.com/) &&
--- a/toolkit/components/places/tests/unifiedcomplete/head_autocomplete.js
+++ b/toolkit/components/places/tests/unifiedcomplete/head_autocomplete.js
@@ -229,17 +229,17 @@ function* check_autocomplete(test) {
             // Make it undefined so we don't process it again
             matches[j] = undefined;
             found = true;
             break;
           }
         }
 
         if (!found)
-          do_throw(`Didn't find the current result ("${result.value}", "${result.comment}") in matches`); //' (Emacs syntax highlighting fix)
+          do_throw(`Didn't find the current result ("${result.value}", "${result.comment}") in matches`); // ' (Emacs syntax highlighting fix)
       }
     }
 
     Assert.equal(controller.matchCount, matches.length,
                  "Got as many results as expected");
 
     // If we expect results, make sure we got matches.
     do_check_eq(controller.searchStatus, matches.length ?
--- a/toolkit/components/places/tests/unit/nsDummyObserver.js
+++ b/toolkit/components/places/tests/unit/nsDummyObserver.js
@@ -22,18 +22,18 @@ DummyObserver.prototype = {
   },
   onTitleChanged: function () {},
   onDeleteURI: function () {},
   onClearHistory: function () {},
   onPageChanged: function () {},
   onDeleteVisits: function () {},
 
   // bookmark observer
-  //onBeginUpdateBatch: function() {},
-  //onEndUpdateBatch: function() {},
+  // onBeginUpdateBatch: function() {},
+  // onEndUpdateBatch: function() {},
   onItemAdded: function(aItemId, aParentId, aIndex, aItemType, aURI) {
     Services.obs.notifyObservers(null, "dummy-observer-item-added", null);
   },
   onItemChanged: function () {},
   onItemRemoved: function() {},
   onItemVisited: function() {},
   onItemMoved: function() {},
 
--- a/toolkit/components/places/tests/unit/test_000_frecency.js
+++ b/toolkit/components/places/tests/unit/test_000_frecency.js
@@ -74,17 +74,17 @@ function* task_initializeBucket(bucket) 
     var frecency = -1;
     var calculatedURI = null;
     var matchTitle = "";
     var bonusValue = prefs.getIntPref(prefPrefix + bonusName);
     // unvisited (only for first cutoff date bucket)
     if (bonusName == "unvisitedBookmarkBonus" || bonusName == "unvisitedTypedBonus") {
       if (cutoffName == "firstBucketCutoff") {
         let points = Math.ceil(bonusValue / parseFloat(100.0) * weight);
-        var visitCount = 1; //bonusName == "unvisitedBookmarkBonus" ? 1 : 0;
+        var visitCount = 1; // bonusName == "unvisitedBookmarkBonus" ? 1 : 0;
         frecency = Math.ceil(visitCount * points);
         calculatedURI = uri("http://" + searchTerm + ".com/" +
           bonusName + ":" + bonusValue + "/cutoff:" + cutoff +
           "/weight:" + weight + "/frecency:" + frecency);
         if (bonusName == "unvisitedBookmarkBonus") {
           matchTitle = searchTerm + "UnvisitedBookmark";
           bmsvc.insertBookmark(bmsvc.unfiledBookmarksFolder, calculatedURI, bmsvc.DEFAULT_INDEX, matchTitle);
         }
@@ -209,17 +209,17 @@ add_task(function* test_frecency()
   }
 
   // sort results by frecency
   results.sort((a, b) => b[1] - a[1]);
   // Make sure there's enough results returned
   prefs.setIntPref("browser.urlbar.maxRichResults", results.length);
 
   // DEBUG
-  //results.every(function(el) { dump("result: " + el[1] + ": " + el[0].spec + " (" + el[2] + ")\n"); return true; })
+  // results.every(function(el) { dump("result: " + el[1] + ": " + el[0].spec + " (" + el[2] + ")\n"); return true; })
 
   yield PlacesTestUtils.promiseAsyncUpdates();
 
   var controller = Components.classes["@mozilla.org/autocomplete/controller;1"].
                    getService(Components.interfaces.nsIAutoCompleteController);
 
   // Make an AutoCompleteInput that uses our searches
   // and confirms results on search complete
--- a/toolkit/components/places/tests/unit/test_405497.js
+++ b/toolkit/components/places/tests/unit/test_405497.js
@@ -20,35 +20,35 @@ var bs = Cc["@mozilla.org/browser/nav-bo
  *        runInBatchMode the second time.
  */
 function callback(aService)
 {
   this.callCount = 0;
   this.service = aService;
 }
 callback.prototype = {
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsINavHistoryBatchCallback
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsINavHistoryBatchCallback
 
   runBatched: function(aUserData)
   {
     this.callCount++;
 
     if (this.callCount == 1) {
       // We want to call run in batched once more.
       this.service.runInBatchMode(this, null);
       return;
     }
 
     do_check_eq(this.callCount, 2);
     do_test_finished();
   },
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsISupports
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsISupports
 
   QueryInterface: XPCOMUtils.generateQI([Ci.nsINavHistoryBatchCallback])
 };
 
 function run_test() {
   // checking the history service
   do_test_pending();
   hs.runInBatchMode(new callback(hs), null);
--- a/toolkit/components/places/tests/unit/test_412132.js
+++ b/toolkit/components/places/tests/unit/test_412132.js
@@ -125,14 +125,14 @@ add_task(function* changeuri_nonexistent
                                                 "bookmark title");
   PlacesUtils.bookmarks.removeItem(id);
   tryChange(id);
 
   yield PlacesUtils.bookmarks.eraseEverything();
   yield PlacesTestUtils.clearHistory();
 });
 
-///////////////////////////////////////////////////////////////////////////////
+// /////////////////////////////////////////////////////////////////////////////
 
 function run_test()
 {
   run_next_test();
 }
--- a/toolkit/components/places/tests/unit/test_async_history_api.js
+++ b/toolkit/components/places/tests/unit/test_async_history_api.js
@@ -1,21 +1,21 @@
 /**
  * This file tests the async history API exposed by mozIAsyncHistory.
  */
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 const TEST_DOMAIN = "http://mozilla.org/";
 const URI_VISIT_SAVED = "uri-visit-saved";
 const RECENT_EVENT_THRESHOLD = 15 * 60 * 1000000;
 
-////////////////////////////////////////////////////////////////////////////////
-//// Helpers
+// //////////////////////////////////////////////////////////////////////////////
+// // Helpers
 /**
  * Object that represents a mozIVisitInfo object.
  *
  * @param [optional] aTransitionType
  *        The transition type of the visit.  Defaults to TRANSITION_LINK if not
  *        provided.
  * @param [optional] aVisitTime
  *        The time of the visit.  Defaults to now if not provided.
@@ -131,18 +131,18 @@ function do_check_title_for_uri(aURI,
      WHERE url_hash = hash(:url) AND url = :url`
   );
   stmt.params.url = aURI.spec;
   do_check_true(stmt.executeStep(), stack);
   do_check_eq(stmt.row.title, aTitle, stack);
   stmt.finalize();
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Test Functions
+// //////////////////////////////////////////////////////////////////////////////
+// // Test Functions
 
 add_task(function* test_interface_exists() {
   let history = Cc["@mozilla.org/browser/history;1"].getService(Ci.nsISupports);
   do_check_true(history instanceof Ci.mozIAsyncHistory);
 });
 
 add_task(function* test_invalid_uri_throws() {
   // First, test passing in nothing.
--- a/toolkit/components/places/tests/unit/test_autocomplete_stopSearch_no_throw.js
+++ b/toolkit/components/places/tests/unit/test_autocomplete_stopSearch_no_throw.js
@@ -4,39 +4,39 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
  * Added with bug 508102 to make sure that calling stopSearch on our
  * AutoComplete implementation does not throw.
  */
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals and Constants
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals and Constants
 
 var hs = Cc["@mozilla.org/browser/nav-history-service;1"].
           getService(Ci.nsINavHistoryService);
 var ac = Cc["@mozilla.org/autocomplete/search;1?name=unifiedcomplete"].
          getService(Ci.nsIAutoCompleteSearch);
 
-////////////////////////////////////////////////////////////////////////////////
-//// Test Functions
+// //////////////////////////////////////////////////////////////////////////////
+// // Test Functions
 
 function test_stopSearch()
 {
   try {
     ac.stopSearch();
   }
   catch (e) {
     do_throw("we should not have caught anything!");
   }
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Test Runner
+// //////////////////////////////////////////////////////////////////////////////
+// // Test Runner
 
 var tests = [
   test_stopSearch,
 ];
 function run_test()
 {
   tests.forEach(test => test());
 }
--- a/toolkit/components/places/tests/unit/test_bookmarks_json.js
+++ b/toolkit/components/places/tests/unit/test_bookmarks_json.js
@@ -43,23 +43,23 @@ var test_bookmarks = {
       guid: "OCyeUO5uu9FK",
       type: Ci.nsINavHistoryResultNode.RESULT_TYPE_SEPARATOR
     },
     {
       guid:"OCyeUO5uu9FL",
       title: "test",
       description: "folder test comment",
       dateAdded: 1177541020000000,
-      //lastModified: 1177541050000000,
+      // lastModified: 1177541050000000,
       children: [
         { guid:"OCyeUO5uu9GX",
           title: "test post keyword",
           description: "item description",
           dateAdded: 1177375336000000,
-          //lastModified: 1177375423000000,
+          // lastModified: 1177375423000000,
           keyword: "test",
           sidebar: true,
           postData: "hidden1%3Dbar&text1%3D%25s",
           charset: "ISO-8859-1"
         }
       ]
     }
   ],
--- a/toolkit/components/places/tests/unit/test_bookmarks_restore_notification.js
+++ b/toolkit/components/places/tests/unit/test_bookmarks_restore_notification.js
@@ -23,17 +23,17 @@ const NSIOBSERVER_DATA_HTML_INIT = "html
 var uris = [
   "http://example.com/1",
   "http://example.com/2",
   "http://example.com/3",
   "http://example.com/4",
   "http://example.com/5",
 ];
 
-///////////////////////////////////////////////////////////////////////////////
+// /////////////////////////////////////////////////////////////////////////////
 
 /**
  * Adds some bookmarks for the URIs in |uris|.
  */
 function* addBookmarks() {
   for (let url of uris) {
     yield PlacesUtils.bookmarks.insert({
       url: url, parentGuid: PlacesUtils.bookmarks.menuGuid
@@ -133,17 +133,17 @@ function* teardown(file, begin, success,
   try {
     yield OS.File.remove(file, {ignoreAbsent: true});
   } catch (e) {}
 
   // clean up bookmarks
   yield PlacesUtils.bookmarks.eraseEverything();
 }
 
-///////////////////////////////////////////////////////////////////////////////
+// /////////////////////////////////////////////////////////////////////////////
 add_task(function* test_json_restore_normal() {
   // data: the data passed to nsIObserver.observe() corresponding to the test
   // folderId: for HTML restore into a folder, the folder ID to restore into;
   //           otherwise, set it to null
   let expectedData = {
     data:       NSIOBSERVER_DATA_JSON,
     folderId:   null
   }
--- a/toolkit/components/places/tests/unit/test_history.js
+++ b/toolkit/components/places/tests/unit/test_history.js
@@ -45,30 +45,30 @@ add_task(function* test_execute()
   yield PlacesTestUtils.addVisits(testURI);
 
   // now query for the visit, setting sorting and limit such that
   // we should retrieve only the visit we just added
   var options = histsvc.getNewQueryOptions();
   options.sortingMode = options.SORT_BY_DATE_DESCENDING;
   options.maxResults = 1;
   // TODO: using full visit crashes in xpcshell test
-  //options.resultType = options.RESULTS_AS_FULL_VISIT;
+  // options.resultType = options.RESULTS_AS_FULL_VISIT;
   options.resultType = options.RESULTS_AS_VISIT;
   var query = histsvc.getNewQuery();
   var result = histsvc.executeQuery(query, options);
   var root = result.root;
   root.containerOpen = true;
   var cc = root.childCount;
   for (var i=0; i < cc; ++i) {
     var node = root.getChild(i);
     // test node properties in RESULTS_AS_VISIT
     do_check_eq(node.uri, testURI.spec);
     do_check_eq(node.type, Ci.nsINavHistoryResultNode.RESULT_TYPE_URI);
     // TODO: change query type to RESULTS_AS_FULL_VISIT and test this
-    //do_check_eq(node.transitionType, histsvc.TRANSITION_TYPED);
+    // do_check_eq(node.transitionType, histsvc.TRANSITION_TYPED);
   }
   root.containerOpen = false;
 
   // add another visit for the same URI, and a third visit for a different URI
   var testURI2 = uri("http://google.com/");
   yield PlacesTestUtils.addVisits(testURI);
   yield PlacesTestUtils.addVisits(testURI2);
 
@@ -168,17 +168,17 @@ add_task(function* test_execute()
   }
   finally {
     statement.finalize();
   }
 
   // bug 394741 - regressed history text searches
   yield PlacesTestUtils.addVisits(uri("http://mozilla.com"));
   options = histsvc.getNewQueryOptions();
-  //options.resultType = options.RESULTS_AS_VISIT;
+  // options.resultType = options.RESULTS_AS_VISIT;
   query = histsvc.getNewQuery();
   query.searchTerms = "moz";
   result = histsvc.executeQuery(query, options);
   root = result.root;
   root.containerOpen = true;
   do_check_true(root.childCount > 0);
   root.containerOpen = false;
 });
--- a/toolkit/components/places/tests/unit/test_history_observer.js
+++ b/toolkit/components/places/tests/unit/test_history_observer.js
@@ -95,17 +95,17 @@ add_task(function* test_onVisit() {
 });
 
 add_task(function* test_multiple_onVisit() {
   let testuri = NetUtil.newURI("http://self.firefox.com/");
   let promiseNotifications = new Promise(resolve => {
     let observer = {
       _c: 0,
       __proto__: NavHistoryObserver.prototype,
-      onVisit(uri, id, time, undefined, referrerId, transition, guid,
+      onVisit(uri, id, time, unused, referrerId, transition, guid,
               hidden, visitCount, typed) {
         Assert.ok(testuri.equals(uri));
         Assert.ok(id > 0);
         Assert.ok(time > 0);
         Assert.ok(!hidden);
         do_check_guid_for_uri(uri, guid);
         switch (++this._c) {
           case 1:
--- a/toolkit/components/places/tests/unit/test_placesTxn.js
+++ b/toolkit/components/places/tests/unit/test_placesTxn.js
@@ -429,27 +429,27 @@ add_task(function* test_removing_separat
   let txn = new PlacesRemoveItemTransaction(sepId);
 
   txn.doTransaction();
   do_check_eq(observer._itemRemovedId, sepId);
   do_check_eq(observer._itemRemovedFolder, testFolder);
   do_check_eq(observer._itemRemovedIndex, 0);
 
   txn.undoTransaction();
-  do_check_eq(observer._itemAddedId, sepId); //New separator created
+  do_check_eq(observer._itemAddedId, sepId); // New separator created
   do_check_eq(observer._itemAddedParent, testFolder);
   do_check_eq(observer._itemAddedIndex, 0);
 
   txn.redoTransaction();
   do_check_eq(observer._itemRemovedId, sepId);
   do_check_eq(observer._itemRemovedFolder, testFolder);
   do_check_eq(observer._itemRemovedIndex, 0);
 
   txn.undoTransaction();
-  do_check_eq(observer._itemAddedId, sepId); //New separator created
+  do_check_eq(observer._itemAddedId, sepId); // New separator created
   do_check_eq(observer._itemAddedParent, testFolder);
   do_check_eq(observer._itemAddedIndex, 0);
 });
 
 add_task(function* test_editing_item_title() {
   const TITLE = "Test editing item title";
   const MOD_TITLE = "Mod: Test editing item title";
   let testURI = NetUtil.newURI("http://www.test_editing_item_title.com");
--- a/toolkit/components/places/tests/unit/test_preventive_maintenance.js
+++ b/toolkit/components/places/tests/unit/test_preventive_maintenance.js
@@ -19,17 +19,17 @@ const FINISHED_MAINTENANCE_NOTIFICATION_
 var hs = PlacesUtils.history;
 var bs = PlacesUtils.bookmarks;
 var ts = PlacesUtils.tagging;
 var as = PlacesUtils.annotations;
 var fs = PlacesUtils.favicons;
 
 var mDBConn = hs.QueryInterface(Ci.nsPIPlacesDatabase).DBConnection;
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // Helpers
 
 var defaultBookmarksMaxId = 0;
 function cleanDatabase() {
   mDBConn.executeSimpleSQL("DELETE FROM moz_places");
   mDBConn.executeSimpleSQL("DELETE FROM moz_historyvisits");
   mDBConn.executeSimpleSQL("DELETE FROM moz_anno_attributes");
   mDBConn.executeSimpleSQL("DELETE FROM moz_annos");
@@ -62,22 +62,22 @@ function addBookmark(aPlaceId, aType, aP
   stmt.params["keyword_id"] = aKeywordId || null;
   stmt.params["folder_type"] = aFolderType || null;
   stmt.params["title"] = typeof(aTitle) == "string" ? aTitle : null;
   stmt.execute();
   stmt.finalize();
   return mDBConn.lastInsertRowID;
 }
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // Tests
 
 var tests = [];
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 tests.push({
   name: "A.1",
   desc: "Remove obsolete annotations from moz_annos",
 
   _obsoleteWeaveAttribute: "weave/test",
   _placeId: null,
 
@@ -217,17 +217,17 @@ tests.push({
     stmt.reset();
     // Check that unused attribute has been removed
     stmt.params['anno'] = this._unusedAttribute;
     do_check_false(stmt.executeStep());
     stmt.finalize();
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 tests.push({
   name: "B.1",
   desc: "Remove annotations with an invalid attribute",
 
   _usedPageAttribute: "usedPage",
   _placeId: null,
 
@@ -264,17 +264,17 @@ tests.push({
     stmt.finalize();
     // Check that annotation with bogus attribute has been removed
     stmt = mDBConn.createStatement("SELECT id FROM moz_annos WHERE anno_attribute_id = 1337");
     do_check_false(stmt.executeStep());
     stmt.finalize();
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 tests.push({
   name: "B.2",
   desc: "Remove orphan page annotations",
 
   _usedPageAttribute: "usedPage",
   _placeId: null,
 
@@ -311,17 +311,17 @@ tests.push({
     stmt.finalize();
     // Check that an annotation to a nonexistent page has been removed
     stmt = mDBConn.createStatement("SELECT id FROM moz_annos WHERE place_id = 1337");
     do_check_false(stmt.executeStep());
     stmt.finalize();
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 tests.push({
   name: "C.1",
   desc: "fix missing Places root",
 
   setup: function() {
     // Sanity check: ensure that roots are intact.
     do_check_eq(bs.getFolderIdForItem(bs.placesRoot), 0);
     do_check_eq(bs.getFolderIdForItem(bs.bookmarksMenuFolder), bs.placesRoot);
@@ -341,17 +341,17 @@ tests.push({
     do_check_eq(bs.getFolderIdForItem(bs.placesRoot), 0);
     do_check_eq(bs.getFolderIdForItem(bs.bookmarksMenuFolder), bs.placesRoot);
     do_check_eq(bs.getFolderIdForItem(bs.tagsFolder), bs.placesRoot);
     do_check_eq(bs.getFolderIdForItem(bs.unfiledBookmarksFolder), bs.placesRoot);
     do_check_eq(bs.getFolderIdForItem(bs.toolbarFolder), bs.placesRoot);
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 tests.push({
   name: "C.2",
   desc: "Fix roots titles",
 
   setup: function() {
     // Sanity check: ensure that roots titles are correct. We can use our check.
     this.check();
     // Change some roots' titles.
@@ -370,17 +370,17 @@ tests.push({
                 PlacesUtils.getString("TagsFolderTitle"));
     do_check_eq(bs.getItemTitle(bs.unfiledBookmarksFolder),
                 PlacesUtils.getString("OtherBookmarksFolderTitle"));
     do_check_eq(bs.getItemTitle(bs.toolbarFolder),
                 PlacesUtils.getString("BookmarksToolbarFolderTitle"));
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 tests.push({
   name: "D.1",
   desc: "Remove items without a valid place",
 
   _validItemId: null,
   _invalidItemId: null,
   _placeId: null,
@@ -402,17 +402,17 @@ tests.push({
     stmt.reset();
     // Check that invalid bookmark has been removed
     stmt.params["item_id"] = this._invalidItemId;
     do_check_false(stmt.executeStep());
     stmt.finalize();
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 tests.push({
   name: "D.2",
   desc: "Remove items that are not uri bookmarks from tag containers",
 
   _tagId: null,
   _bookmarkId: null,
   _separatorId: null,
@@ -447,17 +447,17 @@ tests.push({
     // Check that folder is no more there
     stmt.params["type"] = bs.TYPE_FOLDER;
     stmt.params["parent"] = this._tagId;
     do_check_false(stmt.executeStep());
     stmt.finalize();
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 tests.push({
   name: "D.3",
   desc: "Remove empty tags",
 
   _tagId: null,
   _bookmarkId: null,
   _emptyTagId: null,
@@ -490,17 +490,17 @@ tests.push({
     stmt.params["id"] = this._emptyTagId;
     stmt.params["type"] = bs.TYPE_FOLDER;
     stmt.params["parent"] = bs.tagsFolder;
     do_check_false(stmt.executeStep());
     stmt.finalize();
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 tests.push({
   name: "D.4",
   desc: "Move orphan items to unsorted folder",
 
   _orphanBookmarkId: null,
   _orphanSeparatorId: null,
   _orphanFolderId: null,
@@ -537,17 +537,17 @@ tests.push({
     stmt.reset();
     stmt.params["item_id"] = this._bookmarkId;
     stmt.params["parent"] = this._orphanFolderId;
     do_check_true(stmt.executeStep());
     stmt.finalize();
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 tests.push({
   name: "D.6",
   desc: "Fix wrong item types | bookmarks",
 
   _separatorId: null,
   _folderId: null,
   _placeId: null,
@@ -570,17 +570,17 @@ tests.push({
     stmt.reset();
     stmt.params["item_id"] = this._folderId;
     stmt.params["type"] = bs.TYPE_BOOKMARK;
     do_check_true(stmt.executeStep());
     stmt.finalize();
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 tests.push({
   name: "D.7",
   desc: "Fix wrong item types | bookmarks",
 
   _validBookmarkId: null,
   _invalidBookmarkId: null,
   _placeId: null,
@@ -604,17 +604,17 @@ tests.push({
     // Check invalid bookmark has been converted to a folder
     stmt.params["item_id"] = this._invalidBookmarkId;
     stmt.params["type"] = bs.TYPE_FOLDER;
     do_check_true(stmt.executeStep());
     stmt.finalize();
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 tests.push({
   name: "D.9",
   desc: "Fix wrong parents",
 
   _bookmarkId: null,
   _separatorId: null,
   _bookmarkId1: null,
@@ -642,17 +642,17 @@ tests.push({
     stmt.reset();
     stmt.params["item_id"] = this._bookmarkId2;
     stmt.params["parent"] = bs.unfiledBookmarksFolder;
     do_check_true(stmt.executeStep());
     stmt.finalize();
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 tests.push({
   name: "D.10",
   desc: "Recalculate positions",
 
   _unfiledBookmarks: [],
   _toolbarBookmarks: [],
 
@@ -733,17 +733,17 @@ tests.push({
       }
     }
 
     check_order(PlacesUtils.unfiledBookmarksFolderId, this._unfiledBookmarks);
     check_order(PlacesUtils.toolbarFolderId, this._toolbarBookmarks);
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 tests.push({
   name: "D.12",
   desc: "Fix empty-named tags",
 
   setup: function() {
     // Add a place to ensure place_id = 1 is valid
     let placeId = addPlace();
@@ -780,17 +780,17 @@ tests.push({
     stmt.reset();
     stmt.params["id"] = this._titledFolderId;
     do_check_true(stmt.executeStep());
     do_check_eq(stmt.row.title, "titledFolder");
     stmt.finalize();
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 tests.push({
   name: "E.1",
   desc: "Remove orphan icons",
 
   _placeId: null,
 
   setup: function() {
@@ -816,17 +816,17 @@ tests.push({
     stmt.reset();
     // Check that unused icon has been removed
     stmt.params["favicon_id"] = 2;
     do_check_false(stmt.executeStep());
     stmt.finalize();
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 tests.push({
   name: "F.1",
   desc: "Remove orphan visits",
 
   _placeId: null,
   _invalidPlaceId: 1337,
 
@@ -851,17 +851,17 @@ tests.push({
     stmt.reset();
     // Check that invalid visit has been removed
     stmt.params["place_id"] = this._invalidPlaceId;
     do_check_false(stmt.executeStep());
     stmt.finalize();
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 tests.push({
   name: "G.1",
   desc: "Remove orphan input history",
 
   _placeId: null,
   _invalidPlaceId: 1337,
 
@@ -888,17 +888,17 @@ tests.push({
     stmt.reset();
     // Check that inputhistory on invalid place has gone
     stmt.params["place_id"] = this._invalidPlaceId;
     do_check_false(stmt.executeStep());
     stmt.finalize();
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 tests.push({
   name: "H.1",
   desc: "Remove item annos with an invalid attribute",
 
   _usedItemAttribute: "usedItem",
   _bookmarkId: null,
   _placeId: null,
@@ -938,17 +938,17 @@ tests.push({
     stmt.finalize();
     // Check that annotation with bogus attribute has been removed
     stmt = mDBConn.createStatement("SELECT id FROM moz_items_annos WHERE anno_attribute_id = 1337");
     do_check_false(stmt.executeStep());
     stmt.finalize();
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 tests.push({
   name: "H.2",
   desc: "Remove orphan item annotations",
 
   _usedItemAttribute: "usedItem",
   _bookmarkId: null,
   _invalidBookmarkId: 8888,
@@ -990,17 +990,17 @@ tests.push({
     // Check that an annotation to a nonexistent page has been removed
     stmt = mDBConn.createStatement("SELECT id FROM moz_items_annos WHERE item_id = 8888");
     do_check_false(stmt.executeStep());
     stmt.finalize();
   }
 });
 
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 tests.push({
   name: "I.1",
   desc: "Remove unused keywords",
 
   _bookmarkId: null,
   _placeId: null,
 
@@ -1020,17 +1020,17 @@ tests.push({
     // Check that "unused" keyword has gone
     stmt.params["keyword"] = "unused";
     do_check_false(stmt.executeStep());
     stmt.finalize();
   }
 });
 
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 tests.push({
   name: "L.1",
   desc: "Fix wrong favicon ids",
 
   _validIconPlaceId: null,
   _invalidIconPlaceId: null,
 
@@ -1063,17 +1063,17 @@ tests.push({
     do_check_true(stmt.executeStep());
     stmt.reset();
     stmt.params["place_id"] = this._invalidIconPlaceId;
     do_check_true(stmt.executeStep());
     stmt.finalize();
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 tests.push({
   name: "L.2",
   desc: "Recalculate visit_count and last_visit_date",
 
   setup: function* () {
     function setVisitCount(aURL, aValue) {
       let stmt = mDBConn.createStatement(
@@ -1142,17 +1142,17 @@ tests.push({
        JOIN moz_historyvisits v ON v.place_id = h.id
        GROUP BY h.id HAVING h.last_visit_date <> MAX(v.visit_date)`
     );
     do_check_false(stmt.executeStep());
     stmt.finalize();
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 tests.push({
   name: "L.3",
   desc: "recalculate hidden for redirects.",
 
   *setup() {
     yield PlacesTestUtils.addVisits([
       { uri: NetUtil.newURI("http://l3.moz.org/"),
@@ -1192,17 +1192,17 @@ tests.push({
           resolve();
         }
       });
       stmt.finalize();
     });
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 tests.push({
   name: "L.4",
   desc: "recalculate foreign_count.",
 
   *setup() {
     this._pageGuid = (yield PlacesUtils.history.insert({ url: "http://l4.moz.org/",
                                                          visits: [{ date: new Date() }] })).guid;
@@ -1219,17 +1219,17 @@ tests.push({
     return rows[0].getResultByName("foreign_count");
   },
 
   *check() {
     Assert.equal((yield this._getForeignCount()), 2);
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 tests.push({
   name: "L.5",
   desc: "recalculate hashes when missing.",
 
   *setup() {
     this._pageGuid = (yield PlacesUtils.history.insert({ url: "http://l5.moz.org/",
                                                          visits: [{ date: new Date() }] })).guid;
@@ -1247,17 +1247,17 @@ tests.push({
     return rows[0].getResultByName("url_hash");
   },
 
   *check() {
     Assert.ok((yield this._getHash()) > 0);
   }
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 tests.push({
   name: "Z",
   desc: "Sanity: Preventive maintenance does not touch valid items",
 
   _uri1: uri("http://www1.mozilla.org"),
   _uri2: uri("http://www2.mozilla.org"),
   _folderId: null,
@@ -1311,17 +1311,17 @@ tests.push({
       fs.getFaviconURLForPage(this._uri2, aFaviconURI => {
         do_check_true(aFaviconURI.equals(SMALLPNG_DATA_URI));
         resolve();
       });
     });
   })
 });
 
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 
 add_task(function* test_preventive_maintenance()
 {
   // Get current bookmarks max ID for cleanup
   let stmt = mDBConn.createStatement("SELECT MAX(id) FROM moz_bookmarks");
   stmt.executeStep();
   defaultBookmarksMaxId = stmt.getInt32(0);
   stmt.finalize();
--- a/toolkit/components/places/tests/unit/test_sql_guid_functions.js
+++ b/toolkit/components/places/tests/unit/test_sql_guid_functions.js
@@ -14,18 +14,18 @@
  */
 function check_invariants(aGuid)
 {
   do_print("Checking guid '" + aGuid + "'");
 
   do_check_valid_places_guid(aGuid);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Test Functions
+// //////////////////////////////////////////////////////////////////////////////
+// // Test Functions
 
 function test_guid_invariants()
 {
   const kExpectedChars = 64;
   const kAllowedChars =
     "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_"
   do_check_eq(kAllowedChars.length, kExpectedChars);
   const kGuidLength = 12;
@@ -89,18 +89,18 @@ function test_guid_on_background()
       do_check_eq(aReason, Ci.mozIStorageStatementCallback.REASON_FINISHED);
       do_check_true(checked);
       run_next_test();
     }
   });
   stmt.finalize();
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Test Runner
+// //////////////////////////////////////////////////////////////////////////////
+// // Test Runner
 
 [
   test_guid_invariants,
   test_guid_on_background,
 ].forEach(add_test);
 
 function run_test()
 {
--- a/toolkit/components/places/tests/unit/test_telemetry.js
+++ b/toolkit/components/places/tests/unit/test_telemetry.js
@@ -11,17 +11,17 @@ var histograms = {
   PLACES_TAGS_COUNT: val => do_check_eq(val, 1),
   PLACES_KEYWORDS_COUNT: val => do_check_eq(val, 1),
   PLACES_SORTED_BOOKMARKS_PERC: val => do_check_eq(val, 100),
   PLACES_TAGGED_BOOKMARKS_PERC: val => do_check_eq(val, 100),
   PLACES_DATABASE_FILESIZE_MB: val => do_check_true(val > 0),
   PLACES_DATABASE_PAGESIZE_B: val => do_check_eq(val, 32768),
   PLACES_DATABASE_SIZE_PER_PAGE_B: val => do_check_true(val > 0),
   PLACES_EXPIRATION_STEPS_TO_CLEAN2: val => do_check_true(val > 1),
-  //PLACES_AUTOCOMPLETE_1ST_RESULT_TIME_MS:  val => do_check_true(val > 1),
+  // PLACES_AUTOCOMPLETE_1ST_RESULT_TIME_MS:  val => do_check_true(val > 1),
   PLACES_IDLE_FRECENCY_DECAY_TIME_MS: val => do_check_true(val > 0),
   PLACES_IDLE_MAINTENANCE_TIME_MS: val => do_check_true(val > 0),
   // One from the `setItemAnnotation` call; the other from the mobile root.
   // This can be removed along with the anno in bug 1306445.
   PLACES_ANNOS_BOOKMARKS_COUNT: val => do_check_eq(val, 2),
   PLACES_ANNOS_PAGES_COUNT: val => do_check_eq(val, 1),
   PLACES_MAINTENANCE_DAYSFROMLAST: val => do_check_true(val >= 0),
 }
--- a/toolkit/components/places/tests/unit/test_utils_setAnnotationsFor.js
+++ b/toolkit/components/places/tests/unit/test_utils_setAnnotationsFor.js
@@ -50,17 +50,17 @@ function run_test() {
   PlacesUtils.setAnnotationsForURI(testURI, testAnnos);
   // Check for correct addition
   testAnnos.forEach(function(anno) {
     do_check_true(as.pageHasAnnotation(testURI, anno.name));
     do_check_eq(as.getPageAnnotation(testURI, anno.name), anno.value);
   });
 
   // To unset annotations we unset their values or set them to
-  //null/undefined
+  // null/undefined
   testAnnos[0].value = null;
   testAnnos[1].value = undefined;
   delete testAnnos[2].value;
   delete testAnnos[3].value;
 
   // Unset all item annotations
   PlacesUtils.setAnnotationsForItem(itemId, testAnnos);
   // Check for correct removal
--- a/toolkit/components/printing/content/printPageSetup.js
+++ b/toolkit/components/printing/content/printPageSetup.js
@@ -10,20 +10,20 @@ var gPrefs         = null;
 var gPrintService  = null;
 var gPrintSettings = null;
 var gStringBundle  = null;
 var gDoingMetric   = false;
 
 var gPrintSettingsInterface = Components.interfaces.nsIPrintSettings;
 var gDoDebug = false;
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function initDialog()
 {
-  gDialog = new Object;
+  gDialog = {};
 
   gDialog.orientation     = document.getElementById("orientation");
   gDialog.portrait        = document.getElementById("portrait");
   gDialog.landscape       = document.getElementById("landscape");
 
   gDialog.printBG         = document.getElementById("printBG");
 
   gDialog.shrinkToFit     = document.getElementById("shrinkToFit");
@@ -57,40 +57,40 @@ function initDialog()
   gDialog.strings                        = new Array;
   gDialog.strings["marginUnits.inches"]  = document.getElementById("marginUnits.inches").childNodes[0].nodeValue;
   gDialog.strings["marginUnits.metric"]  = document.getElementById("marginUnits.metric").childNodes[0].nodeValue;
   gDialog.strings["customPrompt.title"]  = document.getElementById("customPrompt.title").childNodes[0].nodeValue;
   gDialog.strings["customPrompt.prompt"] = document.getElementById("customPrompt.prompt").childNodes[0].nodeValue;
 
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function isListOfPrinterFeaturesAvailable()
 {
   var has_printerfeatures = false;
 
   try {
     has_printerfeatures = gPrefs.getBoolPref("print.tmp.printerfeatures." + gPrintSettings.printerName + ".has_special_printerfeatures");
   } catch (ex) {
   }
 
   return has_printerfeatures;
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function checkDouble(element)
 {
   element.value = element.value.replace(/[^.0-9]/g, "");
 }
 
 // Theoretical paper width/height.
 var gPageWidth  = 8.5;
 var gPageHeight = 11.0;
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function setOrientation()
 {
   var selection = gDialog.orientation.selectedItem;
 
   var style = "background-color:white;";
   if ((selection == gDialog.portrait && gPageWidth > gPageHeight) ||
       (selection == gDialog.landscape && gPageWidth < gPageHeight)) {
     // Swap width/height.
@@ -98,30 +98,30 @@ function setOrientation()
     gPageHeight = gPageWidth;
     gPageWidth = temp;
   }
   var div = gDoingMetric ? 100 : 10;
   style += "width:" + gPageWidth/div + unitString() + ";height:" + gPageHeight/div + unitString() + ";";
   gDialog.marginPage.setAttribute( "style", style );
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function unitString()
 {
   return (gPrintSettings.paperSizeUnit == gPrintSettingsInterface.kPaperSizeInches) ? "in" : "mm";
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function checkMargin( value, max, other )
 {
   // Don't draw this margin bigger than permitted.
   return Math.min(value, max - other.value);
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function changeMargin( node )
 {
   // Correct invalid input.
   checkDouble(node);
 
   // Reset the margin height/width for this node.
   var val = node.value;
   var nodeToStyle;
@@ -140,43 +140,43 @@ function changeMargin( node )
   } else {
     nodeToStyle = gDialog.marginRight;
     val = checkMargin( val, gPageWidth, gDialog.leftInput );
   }
   var style = attr + ":" + (val/10) + unitString() + ";";
   nodeToStyle.setAttribute( "style", style );
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function changeMargins()
 {
   changeMargin( gDialog.topInput );
   changeMargin( gDialog.bottomInput );
   changeMargin( gDialog.leftInput );
   changeMargin( gDialog.rightInput );
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function customize( node )
 {
   // If selection is now "Custom..." then prompt user for custom setting.
   if ( node.value == 6 ) {
     var prompter = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
                      .getService( Components.interfaces.nsIPromptService );
     var title      = gDialog.strings["customPrompt.title"];
     var promptText = gDialog.strings["customPrompt.prompt"];
     var result = { value: node.custom };
     var ok = prompter.prompt(window, title, promptText, result, null, { value: false } );
     if ( ok ) {
         node.custom = result.value;
     }
   }
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function setHeaderFooter( node, value )
 {
   node.value= hfValueToId(value);
   if (node.value == 6) {
     // Remember current Custom... value.
     node.custom = value;
   } else {
     // Start with empty Custom... value.
@@ -242,17 +242,17 @@ function setPrinterDefaultsForSelectedPr
   // now augment them with any values from last time
   gPrintService.initPrintSettingsFromPrefs(gPrintSettings, true, gPrintSettingsInterface.kInitSaveAll);
 
   if (gDoDebug) {
     dump("pagesetup/setPrinterDefaultsForSelectedPrinter: printerName='"+gPrintSettings.printerName+"', orientation='"+gPrintSettings.orientation+"'\n");
   }
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function loadDialog()
 {
   var print_orientation   = 0;
   var print_margin_top    = 0.5;
   var print_margin_left   = 0.5;
   var print_margin_bottom = 0.5;
   var print_margin_right  = 0.5;
 
@@ -342,17 +342,17 @@ function loadDialog()
       gDialog.orientation.setAttribute("disabled", "true");
   }
 
   // Give initial focus to the orientation radio group.
   // Done on a timeout due to to bug 103197.
   setTimeout( function() { gDialog.orientation.focus(); }, 0 );
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function onLoad()
 {
   // Init gDialog.
   initDialog();
 
   if (window.arguments[0] != null) {
     gPrintSettings = window.arguments[0].QueryInterface(Components.interfaces.nsIPrintSettings);
     paramBlock     = window.arguments[1].QueryInterface(Components.interfaces.nsIDialogParamBlock);
@@ -381,17 +381,17 @@ function convertUnitsMarginToInches(aVal
 function convertMarginInchesToUnits(aVal, aIsMetric)
 {
   if (aIsMetric) {
     return aVal * 25.4;
   }
   return aVal;
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function onAccept()
 {
 
   if (gPrintSettings) {
     if ( gDialog.orientation.selectedItem == gDialog.portrait ) {
       gPrintSettings.orientation = gPrintSettingsInterface.kPortraitOrientation;
     } else {
       gPrintSettings.orientation = gPrintSettingsInterface.kLandscapeOrientation;
@@ -458,17 +458,17 @@ function onAccept()
               gPrintSettingsInterface.kInitSaveShrinkToFit |
               gPrintSettingsInterface.kInitSaveScaling;
 
   gPrintService.savePrintSettingsToPrefs(gPrintSettings, true, flags);
 
   return true;
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function onCancel()
 {
   // set return value to "cancel"
   if (paramBlock) {
     paramBlock.SetInt(0, 0);
   } else {
     dump("*** FATAL ERROR: No paramBlock\n");
   }
--- a/toolkit/components/printing/content/printPreviewProgress.js
+++ b/toolkit/components/printing/content/printPreviewProgress.js
@@ -87,27 +87,27 @@ function onLoad() {
   }
 
   if (!printProgress) {
     dump( "Invalid argument to printPreviewProgress.xul\n" );
     window.close()
     return;
   }
 
-  dialog         = new Object;
+  dialog         = {};
   dialog.strings = new Array;
   dialog.title   = document.getElementById("dialog.title");
   dialog.titleLabel = document.getElementById("dialog.titleLabel");
 
   dialog.title.value = docTitle;
 
   // set our web progress listener on the helper app launcher
   printProgress.registerListener(progressListener);
 
-  //We need to delay the set title else dom will overwrite it
+  // We need to delay the set title else dom will overwrite it
   window.setTimeout(doneIniting, 100);
 }
 
 function onUnload()
 {
   if (!printProgress)
     return;
   try {
--- a/toolkit/components/printing/content/printProgress.js
+++ b/toolkit/components/printing/content/printProgress.js
@@ -215,17 +215,17 @@ function onLoad() {
     }
 
     if ( !printProgress ) {
         dump( "Invalid argument to printProgress.xul\n" );
         window.close()
         return;
     }
 
-    dialog = new Object;
+    dialog = {};
     dialog.strings = new Array;
     dialog.title        = document.getElementById("dialog.title");
     dialog.titleLabel   = document.getElementById("dialog.titleLabel");
     dialog.progress     = document.getElementById("dialog.progress");
     dialog.progressText = document.getElementById("dialog.progressText");
     dialog.progressLabel = document.getElementById("dialog.progressLabel");
     dialog.tempLabel    = document.getElementById("dialog.tempLabel");
 
@@ -239,17 +239,17 @@ function onLoad() {
 
     dialog.title.value = docTitle;
 
     // Fill dialog.
     loadDialog();
 
     // set our web progress listener on the helper app launcher
     printProgress.registerListener(progressListener);
-    //We need to delay the set title else dom will overwrite it
+    // We need to delay the set title else dom will overwrite it
     window.setTimeout(doneIniting, 500);
 }
 
 function onUnload()
 {
   if (printProgress)
   {
    try
--- a/toolkit/components/printing/content/printUtils.js
+++ b/toolkit/components/printing/content/printUtils.js
@@ -295,19 +295,19 @@ var PrintUtils = {
 
     return this._listener.getPrintPreviewBrowser().docShell.printPreview;
   },
 
   get inPrintPreview() {
     return document.getElementById("print-preview-toolbar") != null;
   },
 
-  ////////////////////////////////////////////////////
+  // //////////////////////////////////////////////////
   // "private" methods and members. Don't use them. //
-  ///////////////////////////////////////////////////
+  // /////////////////////////////////////////////////
 
   _listener: null,
   _closeHandlerPP: null,
   _webProgressPP: null,
   _sourceBrowser: null,
   _originalTitle: "",
   _originalURL: "",
   _shouldSimplify: false,
--- a/toolkit/components/printing/content/printdialog.js
+++ b/toolkit/components/printing/content/printdialog.js
@@ -10,20 +10,20 @@ var gOriginalNumCopies = 1;
 
 var paramBlock;
 var gPrefs             = null;
 var gPrintSettings     = null;
 var gWebBrowserPrint   = null;
 var gPrintSetInterface = Components.interfaces.nsIPrintSettings;
 var doDebug            = false;
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function initDialog()
 {
-  dialog = new Object;
+  dialog = {};
 
   dialog.propertiesButton = document.getElementById("properties");
   dialog.descText         = document.getElementById("descText");
 
   dialog.printrangeGroup = document.getElementById("printrangeGroup");
   dialog.allpagesRadio   = document.getElementById("allpagesRadio");
   dialog.rangeRadio      = document.getElementById("rangeRadio");
   dialog.selectionRadio  = document.getElementById("selectionRadio");
@@ -48,54 +48,54 @@ function initDialog()
 
   // <data> elements
   dialog.printName       = document.getElementById("printButton");
   dialog.fpDialog        = document.getElementById("fpDialog");
 
   dialog.enabled         = false;
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function checkInteger(element)
 {
   var value = element.value;
   if (value && value.length > 0) {
     value = value.replace(/[^0-9]/g, "");
     if (!value) value = "";
     element.value = value;
   }
   if (!value || value < 1 || value > 999)
     dialog.printButton.setAttribute("disabled", "true");
   else
     dialog.printButton.removeAttribute("disabled");
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function stripTrailingWhitespace(element)
 {
   var value = element.value;
   value = value.replace(/\s+$/, "");
   element.value = value;
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function getPrinterDescription(printerName)
 {
   var s = "";
 
   try {
     /* This may not work with non-ASCII test (see bug 235763 comment #16) */
     s = gPrefs.getCharPref("print.printer_" + printerName + ".printer_description")
   } catch (e) {
   }
 
   return s;
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function listElement(aListElement)
   {
     this.listElement = aListElement;
   }
 
 listElement.prototype =
   {
     clearList:
@@ -131,17 +131,17 @@ listElement.prototype =
               printerNameStr = aDataObject.getNext();
               list.appendItem(printerNameStr, printerNameStr, getPrinterDescription(printerNameStr));
             } while (aDataObject.hasMore());
             this.listElement.removeAttribute("disabled");
           }
         }
   };
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function getPrinters()
 {
   var selectElement = new listElement(dialog.printerList);
   selectElement.clearList();
 
   var printerEnumerator;
   try {
     printerEnumerator =
@@ -153,17 +153,17 @@ function getPrinters()
   selectElement.appendPrinterNames(printerEnumerator);
   selectElement.listElement.value = printService.defaultPrinterName;
 
   // make sure we load the prefs for the initially selected printer
   setPrinterDefaultsForSelectedPrinter();
 }
 
 
-//---------------------------------------------------
+// ---------------------------------------------------
 // update gPrintSettings with the defaults for the selected printer
 function setPrinterDefaultsForSelectedPrinter()
 {
   gPrintSettings.printerName = dialog.printerList.value;
 
   dialog.descText.value = getPrinterDescription(gPrintSettings.printerName);
 
   // First get any defaults from the printer
@@ -172,49 +172,49 @@ function setPrinterDefaultsForSelectedPr
   // now augment them with any values from last time
   printService.initPrintSettingsFromPrefs(gPrintSettings, true, gPrintSetInterface.kInitSaveAll);
 
   if (doDebug) {
     dump("setPrinterDefaultsForSelectedPrinter: printerName='"+gPrintSettings.printerName+"', paperName='"+gPrintSettings.paperName+"'\n");
   }
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function displayPropertiesDialog()
 {
   gPrintSettings.numCopies = dialog.numCopiesInput.value;
   try {
     var printingPromptService = Components.classes["@mozilla.org/embedcomp/printingprompt-service;1"]
                                                  .getService(Components.interfaces.nsIPrintingPromptService);
     if (printingPromptService) {
       printingPromptService.showPrinterProperties(null, dialog.printerList.value, gPrintSettings);
       dialog.numCopiesInput.value = gPrintSettings.numCopies;
     }
   } catch (e) {
     dump("problems getting printingPromptService\n");
   }
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function doPrintRange(inx)
 {
   if (inx == 1) {
     dialog.frompageInput.removeAttribute("disabled");
     dialog.frompageLabel.removeAttribute("disabled");
     dialog.topageInput.removeAttribute("disabled");
     dialog.topageLabel.removeAttribute("disabled");
   } else {
     dialog.frompageInput.setAttribute("disabled", "true");
     dialog.frompageLabel.setAttribute("disabled", "true");
     dialog.topageInput.setAttribute("disabled", "true");
     dialog.topageLabel.setAttribute("disabled", "true");
   }
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function loadDialog()
 {
   var print_copies        = 1;
   var print_selection_radio_enabled = false;
   var print_frametype     = gPrintSetInterface.kSelectedFrame;
   var print_howToEnableUI = gPrintSetInterface.kFrameEnableNone;
   var print_tofile        = "";
 
@@ -273,17 +273,17 @@ function loadDialog()
     dialog.selectedframeRadio.removeAttribute("disabled");
     dialog.eachframesepRadio.removeAttribute("disabled");
     dialog.printframeGroupLabel.removeAttribute("disabled");
 
     // initialize radio group
     dialog.printframeGroup.selectedItem = dialog.selectedframeRadio;
 
   } else if (print_howToEnableUI == gPrintSetInterface.kFrameEnableAsIsAndEach) {
-    dialog.aslaidoutRadio.removeAttribute("disabled");       //enable
+    dialog.aslaidoutRadio.removeAttribute("disabled");       // enable
 
     dialog.selectedframeRadio.setAttribute("disabled", "true"); // disable
     dialog.eachframesepRadio.removeAttribute("disabled");       // enable
     dialog.printframeGroupLabel.removeAttribute("disabled");    // enable
 
     // initialize
     dialog.printframeGroup.selectedItem = dialog.eachframesepRadio;
 
@@ -292,17 +292,17 @@ function loadDialog()
     dialog.selectedframeRadio.setAttribute("disabled", "true");
     dialog.eachframesepRadio.setAttribute("disabled", "true");
     dialog.printframeGroupLabel.setAttribute("disabled", "true");
   }
 
   dialog.printButton.label = dialog.printName.getAttribute("label");
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function onLoad()
 {
   // Init dialog.
   initDialog();
 
   // param[0]: nsIPrintSettings object
   // param[1]: container for return value (1 = print, 0 = cancel)
 
@@ -311,17 +311,17 @@ function onLoad()
   paramBlock       = window.arguments[2].QueryInterface(Components.interfaces.nsIDialogParamBlock);
 
   // default return value is "cancel"
   paramBlock.SetInt(0, 0);
 
   loadDialog();
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function onAccept()
 {
   if (gPrintSettings != null) {
     var print_howToEnableUI = gPrintSetInterface.kFrameEnableNone;
 
     // save these out so they can be picked up by the device spec
     gPrintSettings.printerName = dialog.printerList.value;
     print_howToEnableUI        = gPrintSettings.howToEnableFrameUI;
@@ -384,30 +384,30 @@ function onAccept()
     paramBlock.SetInt(0, 1);
   } else {
     dump("*** FATAL ERROR: No paramBlock\n");
   }
 
   return true;
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function onCancel()
 {
   // set return value to "cancel"
   if (paramBlock) {
     paramBlock.SetInt(0, 0);
   } else {
     dump("*** FATAL ERROR: No paramBlock\n");
   }
 
   return true;
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 const nsIFilePicker = Components.interfaces.nsIFilePicker;
 function chooseFile()
 {
   try {
     var fp = Components.classes["@mozilla.org/filepicker;1"]
                        .createInstance(nsIFilePicker);
     fp.init(window, dialog.fpDialog.getAttribute("label"), nsIFilePicker.modeSave);
     fp.appendFilters(nsIFilePicker.filterAll);
--- a/toolkit/components/printing/content/printjoboptions.js
+++ b/toolkit/components/printing/content/printjoboptions.js
@@ -9,59 +9,59 @@ var gPrintBundle;
 var gPrintSettings = null;
 var gPrintSettingsInterface  = Components.interfaces.nsIPrintSettings;
 var gPaperArray;
 var gPrefs;
 
 var gPrintSetInterface = Components.interfaces.nsIPrintSettings;
 var doDebug            = true;
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function checkDouble(element, maxVal)
 {
   var value = element.value;
   if (value && value.length > 0) {
     value = value.replace(/[^\.|^0-9]/g, "");
     if (!value) {
       element.value = "";
     } else if (value > maxVal) {
       element.value = maxVal;
     } else {
       element.value = value;
     }
   }
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function isListOfPrinterFeaturesAvailable()
 {
   var has_printerfeatures = false;
 
   try {
     has_printerfeatures = gPrefs.getBoolPref("print.tmp.printerfeatures." + gPrintSettings.printerName + ".has_special_printerfeatures");
   } catch (ex) {
   }
 
   return has_printerfeatures;
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function getDoubleStr(val, dec)
 {
   var str = val.toString();
   var inx = str.indexOf(".");
   return str.substring(0, inx+dec+1);
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function initDialog()
 {
   gPrintBundle = document.getElementById("printBundle");
 
-  dialog = new Object;
+  dialog = {};
 
   dialog.paperList       = document.getElementById("paperList");
   dialog.paperGroup      = document.getElementById("paperGroup");
 
   dialog.jobTitleLabel   = document.getElementById("jobTitleLabel");
   dialog.jobTitleGroup   = document.getElementById("jobTitleGroup");
   dialog.jobTitleInput   = document.getElementById("jobTitleInput");
 
@@ -71,24 +71,24 @@ function initDialog()
   dialog.grayRadio       = document.getElementById("grayRadio");
 
   dialog.topInput        = document.getElementById("topInput");
   dialog.bottomInput     = document.getElementById("bottomInput");
   dialog.leftInput       = document.getElementById("leftInput");
   dialog.rightInput      = document.getElementById("rightInput");
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function round10(val)
 {
   return Math.round(val * 10) / 10;
 }
 
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function paperListElement(aPaperListElement)
   {
     this.paperListElement = aPaperListElement;
   }
 
 paperListElement.prototype =
   {
     clearPaperList:
@@ -122,31 +122,31 @@ paperListElement.prototype =
             itemNode.setAttribute("label", label);
             itemNode.setAttribute("value", i);
             popupNode.appendChild(itemNode);
           }
           this.paperListElement.appendChild(popupNode);
         }
   };
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function createPaperArrayFromDefaults()
 {
   var paperNames   = ["letterSize", "legalSize", "exectiveSize", "a5Size", "a4Size", "a3Size", "a2Size", "a1Size", "a0Size"];
-  //var paperNames   = ["&letterRadio.label;", "&legalRadio.label;", "&exectiveRadio.label;", "&a4Radio.label;", "&a3Radio.label;"];
+  // var paperNames   = ["&letterRadio.label;", "&legalRadio.label;", "&exectiveRadio.label;", "&a4Radio.label;", "&a3Radio.label;"];
   var paperWidths  = [ 8.5,  8.5,  7.25, 148.0, 210.0, 287.0, 420.0, 594.0,  841.0];
   var paperHeights = [11.0, 14.0, 10.50, 210.0, 297.0, 420.0, 594.0, 841.0, 1189.0];
   var paperInches  = [true, true, true,  false, false, false, false, false, false];
   // this is deprecated
   var paperEnums  = [0, 1, 2, 3, 4, 5, 6, 7, 8];
 
   gPaperArray = new Array();
 
   for (var i=0;i<paperNames.length;i++) {
-    var obj    = new Object();
+    var obj    = {};
     obj.name   = paperNames[i];
     obj.width  = paperWidths[i];
     obj.height = paperHeights[i];
     obj.inches = paperInches[i];
 
     /* Calculate the width/height in millimeters */
     if (paperInches[i]) {
       obj.width_mm  = paperWidths[i]  * 25.4;
@@ -155,34 +155,34 @@ function createPaperArrayFromDefaults()
     else {
       obj.width_mm  = paperWidths[i];
       obj.height_mm = paperHeights[i];
     }
     gPaperArray[i] = obj;
   }
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function createPaperArrayFromPrinterFeatures()
 {
   var printername = gPrintSettings.printerName;
   if (doDebug) {
     dump("createPaperArrayFromPrinterFeatures for " + printername + ".\n");
   }
 
   gPaperArray = new Array();
 
   var numPapers = gPrefs.getIntPref("print.tmp.printerfeatures." + printername + ".paper.count");
 
   if (doDebug) {
     dump("processing " + numPapers + " entries...\n");
   }
 
   for (var i=0;i<numPapers;i++) {
-    var obj    = new Object();
+    var obj       = {};
     obj.name      = gPrefs.getCharPref("print.tmp.printerfeatures." + printername + ".paper." + i + ".name");
     obj.width_mm  = gPrefs.getIntPref("print.tmp.printerfeatures."  + printername + ".paper." + i + ".width_mm");
     obj.height_mm = gPrefs.getIntPref("print.tmp.printerfeatures."  + printername + ".paper." + i + ".height_mm");
     obj.inches    = gPrefs.getBoolPref("print.tmp.printerfeatures." + printername + ".paper." + i + ".is_inch");
 
     /* Calculate the width/height in paper's native units (either inches or millimeters) */
     if (obj.inches) {
       obj.width  = obj.width_mm  / 25.4;
@@ -196,43 +196,43 @@ function createPaperArrayFromPrinterFeat
     gPaperArray[i] = obj;
 
     if (doDebug) {
       dump("paper index=" + i + ", name=" + obj.name + ", width=" + obj.width + ", height=" + obj.height + ".\n");
     }
   }
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function createPaperArray()
 {
   if (isListOfPrinterFeaturesAvailable()) {
     createPaperArrayFromPrinterFeatures();
   }
   else {
     createPaperArrayFromDefaults();
   }
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function createPaperSizeList(selectedInx)
 {
   var selectElement = new paperListElement(dialog.paperList);
   selectElement.clearPaperList();
 
   selectElement.appendPaperNames(gPaperArray);
 
   if (selectedInx > -1) {
     selectElement.paperListElement.selectedIndex = selectedInx;
   }
 
-  //dialog.paperList = selectElement;
+  // dialog.paperList = selectElement;
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function loadDialog()
 {
   var print_paper_unit       = 0;
   var print_paper_width      = 0.0;
   var print_paper_height     = 0.0;
   var print_paper_name       = "";
   var print_color            = true;
   var print_jobtitle         = "";
@@ -321,17 +321,17 @@ function loadDialog()
   dialog.jobTitleInput.value = print_jobtitle;
 
   dialog.topInput.value    = gPrintSettings.edgeTop.toFixed(2);
   dialog.bottomInput.value = gPrintSettings.edgeBottom.toFixed(2);
   dialog.leftInput.value   = gPrintSettings.edgeLeft.toFixed(2);
   dialog.rightInput.value  = gPrintSettings.edgeRight.toFixed(2);
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function onLoad()
 {
   // Init dialog.
   initDialog();
 
   gPrintSettings = window.arguments[0].QueryInterface(gPrintSetInterface);
   paramBlock = window.arguments[1].QueryInterface(Components.interfaces.nsIDialogParamBlock);
 
@@ -341,17 +341,17 @@ function onLoad()
   }
 
   // default return value is "cancel"
   paramBlock.SetInt(0, 0);
 
   loadDialog();
 }
 
-//---------------------------------------------------
+// ---------------------------------------------------
 function onAccept()
 {
   var print_paper_unit        = gPrintSettingsInterface.kPaperSizeInches;
   var print_paper_width       = 0.0;
   var print_paper_height      = 0.0;
   var print_paper_name        = "";
 
   if (gPrintSettings != null) {
--- a/toolkit/components/prompts/test/chromeScript.js
+++ b/toolkit/components/prompts/test/chromeScript.js
@@ -197,17 +197,17 @@ function dismissPrompt(ui, action) {
   }
 }
 
 function getDialogDoc() {
   // Trudge through all the open windows, until we find the one
   // that has either commonDialog.xul or selectDialog.xul loaded.
   var wm = Cc["@mozilla.org/appshell/window-mediator;1"].
            getService(Ci.nsIWindowMediator);
-  //var enumerator = wm.getEnumerator("navigator:browser");
+  // var enumerator = wm.getEnumerator("navigator:browser");
   var enumerator = wm.getXULWindowEnumerator(null);
 
   while (enumerator.hasMoreElements()) {
     var win = enumerator.getNext();
     var windowDocShell = win.QueryInterface(Ci.nsIXULWindow).docShell;
 
     var containedDocShells = windowDocShell.getDocShellEnumerator(
                                       Ci.nsIDocShellTreeItem.typeChrome,
--- a/toolkit/components/reader/AboutReader.jsm
+++ b/toolkit/components/reader/AboutReader.jsm
@@ -711,17 +711,17 @@ AboutReader.prototype = {
       }
     }
   },
 
   _maybeSetTextDirection: function Read_maybeSetTextDirection(article) {
     if (!article.dir)
       return;
 
-    //Set "dir" attribute on content
+    // Set "dir" attribute on content
     this._contentElement.setAttribute("dir", article.dir);
     this._headerElement.setAttribute("dir", article.dir);
   },
 
   _fixLocalLinks() {
     // We need to do this because preprocessing the content through nsIParserUtils
     // gives back a DOM with a <base> element. That influences how these URLs get
     // resolved, making them no longer match the document URI (which is
--- a/toolkit/components/satchel/nsFormAutoCompleteResult.jsm
+++ b/toolkit/components/satchel/nsFormAutoCompleteResult.jsm
@@ -40,17 +40,17 @@ FormAutoCompleteResult.prototype = {
   searchString: "",
 
   // The result code of this result object, see |get searchResult| for possible values.
   _searchResult: 0,
 
   // The default item that should be entered if none is selected
   _defaultIndex: 0,
 
-  //The reason the search failed
+  // The reason the search failed
   _errorDescription: "",
 
   /**
    * A reference to the form history nsIAutocompleteResult that we're wrapping.
    * We use this to forward removeEntryAt calls as needed.
    */
   _formHistResult: null,
 
--- a/toolkit/components/satchel/nsFormHistory.js
+++ b/toolkit/components/satchel/nsFormHistory.js
@@ -543,17 +543,17 @@ FormHistory.prototype = {
     },
 
 
     updatePrefs : function () {
         this.debug          = Services.prefs.getBoolPref("browser.formfill.debug");
         this.enabled        = Services.prefs.getBoolPref("browser.formfill.enable");
     },
 
-//**************************************************************************//
+//* *************************************************************************//
     // Database Creation & Access
 
     /*
      * dbCreateStatement
      *
      * Creates a statement, wraps it, and then does parameter replacement
      * Will use memoization so that statements can be reused.
      */
--- a/toolkit/components/satchel/test/test_form_autocomplete_with_list.html
+++ b/toolkit/components/satchel/test/test_form_autocomplete_with_list.html
@@ -165,17 +165,17 @@ function runTest() {
         doKey("return");
         checkForm("final");
         expectPopup();
         restoreForm();
         doKey("down");
         break;
 
     case 6:
-        //Delete the first entry (of 3)
+        // Delete the first entry (of 3)
         doKey("down");
         doKey("delete", shiftModifier);
         waitForMenuChange(3);
         break;
 
     case 7:
         checkForm("");
         countEntries("field1", "historyvalue",
@@ -191,17 +191,17 @@ function runTest() {
 
         // Trigger autocomplete popup
         expectPopup();
         restoreForm();
         doKey("down");
         break;
 
     case 9:
-        //Test deletion
+        // Test deletion
         checkMenuEntries(["PASS1", "PASS2", "final"], testNum);
         // Check the new first entry (of 3)
         doKey("down");
         doKey("return");
         checkForm("Google");
 
         expectPopup();
         restoreForm();
--- a/toolkit/components/sqlite/sqlite_internal.js
+++ b/toolkit/components/sqlite/sqlite_internal.js
@@ -110,144 +110,144 @@ Constants.SQLITE_ROW = 100;
 Constants.SQLITE_DONE = 101;
 
 var Sqlite3 = {
   Constants: Constants,
   Type: Type
 };
 
 declareLazyFFI(Sqlite3, "open", lib, "sqlite3_open", null,
-               /*return*/    Type.int,
-               /*path*/      Type.char.in_ptr,
-               /*db handle*/ Type.sqlite3_ptr.out_ptr);
+               /* return*/    Type.int,
+               /* path*/      Type.char.in_ptr,
+               /* db handle*/ Type.sqlite3_ptr.out_ptr);
 
 declareLazyFFI(Sqlite3, "open_v2", lib, "sqlite3_open_v2", null,
-               /*return*/    Type.int,
-               /*path*/      Type.char.in_ptr,
-               /*db handle*/ Type.sqlite3_ptr.out_ptr,
-               /*flags*/     Type.int,
-               /*VFS*/       Type.char.in_ptr);
+               /* return*/    Type.int,
+               /* path*/      Type.char.in_ptr,
+               /* db handle*/ Type.sqlite3_ptr.out_ptr,
+               /* flags*/     Type.int,
+               /* VFS*/       Type.char.in_ptr);
 
 declareLazyFFI(Sqlite3, "close", lib, "sqlite3_close", null,
-               /*return*/    Type.int,
-               /*db handle*/ Type.sqlite3_ptr);
+               /* return*/    Type.int,
+               /* db handle*/ Type.sqlite3_ptr);
 
 declareLazyFFI(Sqlite3, "prepare_v2", lib, "sqlite3_prepare_v2", null,
-               /*return*/    Type.int,
-               /*db handle*/ Type.sqlite3_ptr,
-               /*zSql*/      Type.char.in_ptr,
-               /*nByte*/     Type.int,
-               /*statement*/ Type.sqlite3_stmt_ptr.out_ptr,
-               /*unused*/    Type.cstring.out_ptr);
+               /* return*/    Type.int,
+               /* db handle*/ Type.sqlite3_ptr,
+               /* zSql*/      Type.char.in_ptr,
+               /* nByte*/     Type.int,
+               /* statement*/ Type.sqlite3_stmt_ptr.out_ptr,
+               /* unused*/    Type.cstring.out_ptr);
 
 declareLazyFFI(Sqlite3, "step", lib, "sqlite3_step", null,
-               /*return*/    Type.int,
-               /*statement*/ Type.sqlite3_stmt_ptr);
+               /* return*/    Type.int,
+               /* statement*/ Type.sqlite3_stmt_ptr);
 
 declareLazyFFI(Sqlite3, "finalize", lib, "sqlite3_finalize", null,
-               /*return*/    Type.int,
-               /*statement*/ Type.sqlite3_stmt_ptr);
+               /* return*/    Type.int,
+               /* statement*/ Type.sqlite3_stmt_ptr);
 
 declareLazyFFI(Sqlite3, "reset", lib, "sqlite3_reset", null,
-               /*return*/    Type.int,
-               /*statement*/ Type.sqlite3_stmt_ptr);
+               /* return*/    Type.int,
+               /* statement*/ Type.sqlite3_stmt_ptr);
 
 declareLazyFFI(Sqlite3, "column_int", lib, "sqlite3_column_int", null,
-               /*return*/    Type.int,
-               /*statement*/ Type.sqlite3_stmt_ptr,
-               /*col*/       Type.int);
+               /* return*/    Type.int,
+               /* statement*/ Type.sqlite3_stmt_ptr,
+               /* col*/       Type.int);
 
 declareLazyFFI(Sqlite3, "column_blob", lib, "sqlite3_column_blob", null,
-               /*return*/    Type.voidptr_t,
-               /*statement*/ Type.sqlite3_stmt_ptr,
-               /*col*/       Type.int);
+               /* return*/    Type.voidptr_t,
+               /* statement*/ Type.sqlite3_stmt_ptr,
+               /* col*/       Type.int);
 
 declareLazyFFI(Sqlite3, "column_bytes", lib, "sqlite3_column_bytes", null,
-               /*return*/    Type.int,
-               /*statement*/ Type.sqlite3_stmt_ptr,
-               /*col*/       Type.int);
+               /* return*/    Type.int,
+               /* statement*/ Type.sqlite3_stmt_ptr,
+               /* col*/       Type.int);
 
 declareLazyFFI(Sqlite3, "column_bytes16", lib, "sqlite3_column_bytes16",
                              null,
-               /*return*/    Type.int,
-               /*statement*/ Type.sqlite3_stmt_ptr,
-               /*col*/       Type.int);
+               /* return*/    Type.int,
+               /* statement*/ Type.sqlite3_stmt_ptr,
+               /* col*/       Type.int);
 
 declareLazyFFI(Sqlite3, "column_double", lib, "sqlite3_column_double", null,
-               /*return*/    Type.double,
-               /*statement*/ Type.sqlite3_stmt_ptr,
-               /*col*/       Type.int);
+               /* return*/    Type.double,
+               /* statement*/ Type.sqlite3_stmt_ptr,
+               /* col*/       Type.int);
 
 declareLazyFFI(Sqlite3, "column_int64", lib, "sqlite3_column_int64", null,
-               /*return*/    Type.sqlite3_int64,
-               /*statement*/ Type.sqlite3_stmt_ptr,
-               /*col*/       Type.int);
+               /* return*/    Type.sqlite3_int64,
+               /* statement*/ Type.sqlite3_stmt_ptr,
+               /* col*/       Type.int);
 
 declareLazyFFI(Sqlite3, "column_text", lib, "sqlite3_column_text", null,
-               /*return*/    Type.cstring,
-               /*statement*/ Type.sqlite3_stmt_ptr,
-               /*col*/       Type.int);
+               /* return*/    Type.cstring,
+               /* statement*/ Type.sqlite3_stmt_ptr,
+               /* col*/       Type.int);
 
 declareLazyFFI(Sqlite3, "column_text16", lib, "sqlite3_column_text16", null,
-               /*return*/    Type.wstring,
-               /*statement*/ Type.sqlite3_stmt_ptr,
-               /*col*/       Type.int);
+               /* return*/    Type.wstring,
+               /* statement*/ Type.sqlite3_stmt_ptr,
+               /* col*/       Type.int);
 
 declareLazyFFI(Sqlite3, "bind_int", lib, "sqlite3_bind_int", null,
-               /*return*/    Type.int,
-               /*statement*/ Type.sqlite3_stmt_ptr,
-               /*index*/     Type.int,
-               /*value*/     Type.int);
+               /* return*/    Type.int,
+               /* statement*/ Type.sqlite3_stmt_ptr,
+               /* index*/     Type.int,
+               /* value*/     Type.int);
 
 declareLazyFFI(Sqlite3, "bind_int64", lib, "sqlite3_bind_int64", null,
-               /*return*/    Type.int,
-               /*statement*/ Type.sqlite3_stmt_ptr,
-               /*index*/     Type.int,
-               /*value*/     Type.sqlite3_int64);
+               /* return*/    Type.int,
+               /* statement*/ Type.sqlite3_stmt_ptr,
+               /* index*/     Type.int,
+               /* value*/     Type.sqlite3_int64);
 
 declareLazyFFI(Sqlite3, "bind_double", lib, "sqlite3_bind_double", null,
-               /*return*/    Type.int,
-               /*statement*/ Type.sqlite3_stmt_ptr,
-               /*index*/     Type.int,
-               /*value*/     Type.double);
+               /* return*/    Type.int,
+               /* statement*/ Type.sqlite3_stmt_ptr,
+               /* index*/     Type.int,
+               /* value*/     Type.double);
 
 declareLazyFFI(Sqlite3, "bind_null", lib, "sqlite3_bind_null", null,
-               /*return*/    Type.int,
-               /*statement*/ Type.sqlite3_stmt_ptr,
-               /*index*/     Type.int);
+               /* return*/    Type.int,
+               /* statement*/ Type.sqlite3_stmt_ptr,
+               /* index*/     Type.int);
 
 declareLazyFFI(Sqlite3, "bind_zeroblob", lib, "sqlite3_bind_zeroblob", null,
-               /*return*/    Type.int,
-               /*statement*/ Type.sqlite3_stmt_ptr,
-               /*index*/     Type.int,
-               /*nBytes*/    Type.int);
+               /* return*/    Type.int,
+               /* statement*/ Type.sqlite3_stmt_ptr,
+               /* index*/     Type.int,
+               /* nBytes*/    Type.int);
 
 declareLazyFFI(Sqlite3, "bind_text", lib, "sqlite3_bind_text", null,
-               /*return*/     Type.int,
-               /*statement*/  Type.sqlite3_stmt_ptr,
-               /*index*/      Type.int,
-               /*value*/      Type.cstring,
-               /*nBytes*/     Type.int,
-               /*destructor*/ Type.sqlite3_destructor_ptr);
+               /* return*/     Type.int,
+               /* statement*/  Type.sqlite3_stmt_ptr,
+               /* index*/      Type.int,
+               /* value*/      Type.cstring,
+               /* nBytes*/     Type.int,
+               /* destructor*/ Type.sqlite3_destructor_ptr);
 
 declareLazyFFI(Sqlite3, "bind_text16", lib, "sqlite3_bind_text16", null,
-               /*return*/     Type.int,
-               /*statement*/  Type.sqlite3_stmt_ptr,
-               /*index*/      Type.int,
-               /*value*/      Type.wstring,
-               /*nBytes*/     Type.int,
-               /*destructor*/ Type.sqlite3_destructor_ptr);
+               /* return*/     Type.int,
+               /* statement*/  Type.sqlite3_stmt_ptr,
+               /* index*/      Type.int,
+               /* value*/      Type.wstring,
+               /* nBytes*/     Type.int,
+               /* destructor*/ Type.sqlite3_destructor_ptr);
 
 declareLazyFFI(Sqlite3, "bind_blob", lib, "sqlite3_bind_blob", null,
-               /*return*/     Type.int,
-               /*statement*/  Type.sqlite3_stmt_ptr,
-               /*index*/      Type.int,
-               /*value*/      Type.voidptr_t,
-               /*nBytes*/     Type.int,
-               /*destructor*/ Type.sqlite3_destructor_ptr);
+               /* return*/     Type.int,
+               /* statement*/  Type.sqlite3_stmt_ptr,
+               /* index*/      Type.int,
+               /* value*/      Type.voidptr_t,
+               /* nBytes*/     Type.int,
+               /* destructor*/ Type.sqlite3_destructor_ptr);
 
 module.exports = {
   get Constants() {
     return Sqlite3.Constants;
   },
   get Type() {
     return Sqlite3.Type;
   },
--- a/toolkit/components/startup/tests/browser/browser_bug537449.js
+++ b/toolkit/components/startup/tests/browser/browser_bug537449.js
@@ -1,15 +1,15 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
-///////////////////
+// /////////////////
 //
 // Whitelisting this test.
 // As part of bug 1077403, the leaking uncaught rejection should be fixed.
 //
 thisTestLeaksUncaughtRejectionsAndShouldBeFixed("TypeError: this.docShell is null");
 
 SpecialPowers.pushPrefEnv({"set": [["dom.require_user_interaction_for_beforeunload", false]]});
 
--- a/toolkit/components/telemetry/TelemetryEnvironment.jsm
+++ b/toolkit/components/telemetry/TelemetryEnvironment.jsm
@@ -1352,17 +1352,17 @@ EnvironmentCache.prototype = {
    */
   _getGFXData: function () {
     let gfxData = {
       D2DEnabled: getGfxField("D2DEnabled", null),
       DWriteEnabled: getGfxField("DWriteEnabled", null),
       ContentBackend: getGfxField("ContentBackend", null),
       // The following line is disabled due to main thread jank and will be enabled
       // again as part of bug 1154500.
-      //DWriteVersion: getGfxField("DWriteVersion", null),
+      // DWriteVersion: getGfxField("DWriteVersion", null),
       adapters: [],
       monitors: [],
       features: {},
     };
 
     if (!["gonk", "android", "linux"].includes(AppConstants.platform)) {
       let gfxInfo = Cc["@mozilla.org/gfx/info;1"].getService(Ci.nsIGfxInfo);
       try {
--- a/toolkit/components/telemetry/TelemetryStorage.jsm
+++ b/toolkit/components/telemetry/TelemetryStorage.jsm
@@ -667,17 +667,17 @@ var TelemetryStorageImpl = {
       }
       this._log.warn("saveArchivedPing - overwriting older ping with the same id");
     }
 
     // Get the archived ping path and append the lz4 suffix to it (so we have 'jsonlz4').
     const filePath = getArchivedPingPath(ping.id, creationDate, ping.type) + "lz4";
     yield OS.File.makeDir(OS.Path.dirname(filePath), { ignoreExisting: true,
                                                        from: OS.Constants.Path.profileDir });
-    yield this.savePingToFile(ping, filePath, /*overwrite*/ true, /*compressed*/ true);
+    yield this.savePingToFile(ping, filePath, /* overwrite*/ true, /* compressed*/ true);
 
     this._archivedPings.set(ping.id, {
       timestampCreated: creationDate.getTime(),
       type: internString(ping.type),
     });
 
     Telemetry.getHistogramById("TELEMETRY_ARCHIVE_SESSION_PING_COUNT").add();
     return undefined;
@@ -712,25 +712,25 @@ var TelemetryStorageImpl = {
         throw new Error("loadArchivedPing - exceeded the maximum ping size: " + fileSize);
       }
     };
 
     try {
       // Try to load a compressed version of the archived ping first.
       this._log.trace("loadArchivedPing - loading ping from: " + pathCompressed);
       yield* checkSize(pathCompressed);
-      return yield this.loadPingFile(pathCompressed, /*compressed*/ true);
+      return yield this.loadPingFile(pathCompressed, /* compressed*/ true);
     } catch (ex) {
       if (!ex.becauseNoSuchFile) {
         throw ex;
       }
       // If that fails, look for the uncompressed version.
       this._log.trace("loadArchivedPing - compressed ping not found, loading: " + path);
       yield* checkSize(path);
-      return yield this.loadPingFile(path, /*compressed*/ false);
+      return yield this.loadPingFile(path, /* compressed*/ false);
     }
   }),
 
   /**
    * Saves session data to disk.
    */
   saveSessionData: function(sessionData) {
     return this._stateSaveSerializer.enqueueTask(() => this._saveSessionData(sessionData));
@@ -1778,17 +1778,17 @@ var TelemetryStorageImpl = {
 
     for (let f of FILES_TO_REMOVE) {
       yield OS.File.remove(f, {ignoreAbsent: true})
                    .catch(e => this._log.error("removeFHRDatabase - failed to remove " + f, e));
     }
   }),
 };
 
-///// Utility functions
+// /// Utility functions
 
 function pingFilePath(ping) {
   // Support legacy ping formats, who don't have an "id" field, but a "slug" field.
   let pingIdentifier = (ping.slug) ? ping.slug : ping.id;
   return OS.Path.join(TelemetryStorage.pingDirectoryPath, pingIdentifier);
 }
 
 function getPingDirectory() {
--- a/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
+++ b/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
@@ -128,17 +128,17 @@ var PluginHost = {
 function registerFakePluginHost() {
   MockRegistrar.register("@mozilla.org/plugin/host;1", PluginHost);
 }
 
 var SysInfo = {
   overrides: {},
 
   getProperty(name) {
-    //Assert.ok(false, "Mock SysInfo: " + name + ", " + JSON.stringify(this.overrides));
+    // Assert.ok(false, "Mock SysInfo: " + name + ", " + JSON.stringify(this.overrides));
     if (name in this.overrides) {
       return this.overrides[name];
     }
     try {
       return this._genuine.getProperty(name);
     } catch (ex) {
       throw ex;
       Assert.ok(false, "Mock SysInfo: oops for " + name + ": " + ex);
@@ -598,22 +598,22 @@ function checkSystemSection(data) {
     Assert.ok(check(data.system.hdd[disk].revision));
   }
 
   let gfxData = data.system.gfx;
   Assert.ok("D2DEnabled" in gfxData);
   Assert.ok("DWriteEnabled" in gfxData);
   // DWriteVersion is disabled due to main thread jank and will be enabled
   // again as part of bug 1154500.
-  //Assert.ok("DWriteVersion" in gfxData);
+  // Assert.ok("DWriteVersion" in gfxData);
   if (gIsWindows) {
     Assert.equal(typeof gfxData.D2DEnabled, "boolean");
     Assert.equal(typeof gfxData.DWriteEnabled, "boolean");
     // As above, will be enabled again as part of bug 1154500.
-    //Assert.ok(checkString(gfxData.DWriteVersion));
+    // Assert.ok(checkString(gfxData.DWriteVersion));
   }
 
   Assert.ok("adapters" in gfxData);
   Assert.ok(gfxData.adapters.length > 0, "There must be at least one GFX adapter.");
   for (let adapter of gfxData.adapters) {
     checkGfxAdapter(adapter);
   }
   Assert.equal(typeof gfxData.adapters[0].GPUActive, "boolean");
--- a/toolkit/components/terminator/nsTerminatorTelemetry.js
+++ b/toolkit/components/terminator/nsTerminatorTelemetry.js
@@ -38,23 +38,23 @@ var HISTOGRAMS = {
   "xpcom-will-shutdown": "SHUTDOWN_PHASE_DURATION_TICKS_XPCOM_WILL_SHUTDOWN",
 };
 
 nsTerminatorTelemetry.prototype = {
   classID: Components.ID("{3f78ada1-cba2-442a-82dd-d5fb300ddea7}"),
 
   _xpcom_factory: XPCOMUtils.generateSingletonFactory(nsTerminatorTelemetry),
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsISupports
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsISupports
 
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsIObserver
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsIObserver
 
   observe: function DS_observe(aSubject, aTopic, aData)
   {
     Task.spawn(function*() {
       //
       // This data is hardly critical, reading it can wait for a few seconds.
       //
       yield new Promise(resolve => setTimeout(resolve, 3000));
@@ -97,12 +97,12 @@ nsTerminatorTelemetry.prototype = {
       // Inform observers that we are done.
       Services.obs.notifyObservers(null,
         "shutdown-terminator-telemetry-updated",
         "");
     });
   },
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// Module
+// //////////////////////////////////////////////////////////////////////////////
+// // Module
 
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory([nsTerminatorTelemetry]);
--- a/toolkit/components/thumbnails/PageThumbUtils.jsm
+++ b/toolkit/components/thumbnails/PageThumbUtils.jsm
@@ -56,38 +56,38 @@ this.PageThumbUtils = {
    */
   getThumbnailSize: function (aWindow = null) {
     if (!this._thumbnailWidth || !this._thumbnailHeight) {
       let screenManager = Cc["@mozilla.org/gfx/screenmanager;1"]
                             .getService(Ci.nsIScreenManager);
       let left = {}, top = {}, screenWidth = {}, screenHeight = {};
       screenManager.primaryScreen.GetRectDisplayPix(left, top, screenWidth, screenHeight);
 
-      /***
+      /** *
        * The system default scale might be different than
        * what is reported by the window. For example,
        * retina displays have 1:1 system scales, but 2:1 window
        * scale as 1 pixel system wide == 2 device pixels.
        * To get the best image quality, query both and take the highest one.
        */
       let systemScale = screenManager.systemDefaultScale;
       let windowScale = aWindow ? aWindow.devicePixelRatio : systemScale;
       let scale = Math.max(systemScale, windowScale);
 
-      /***
+      /** *
        * On retina displays, we can sometimes go down this path
        * without a window object. In those cases, force 2x scaling
        * as the system scale doesn't represent the 2x scaling
        * on OS X.
        */
       if (AppConstants.platform == "macosx" && !aWindow) {
         scale = 2;
       }
 
-      /***
+      /** *
        * THESE VALUES ARE DEFINED IN newtab.css and hard coded.
        * If you change these values from the prefs,
        * ALSO CHANGE THEM IN newtab.css
        */
       let prefWidth = Services.prefs.getIntPref("toolkit.pageThumbs.minWidth");
       let prefHeight = Services.prefs.getIntPref("toolkit.pageThumbs.minHeight");
       let divisor = Services.prefs.getIntPref("toolkit.pageThumbs.screenSizeDivisor");
 
@@ -96,17 +96,17 @@ this.PageThumbUtils = {
 
       this._thumbnailWidth = Math.max(Math.round(screenWidth.value / divisor), prefWidth);
       this._thumbnailHeight = Math.max(Math.round(screenHeight.value / divisor), prefHeight);
     }
 
     return [this._thumbnailWidth, this._thumbnailHeight];
   },
 
-  /***
+  /** *
    * Given a browser window, return the size of the content
    * minus the scroll bars.
    */
   getContentSize: function(aWindow) {
     let utils = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
                        .getInterface(Ci.nsIDOMWindowUtils);
     // aWindow may be a cpow, add exposed props security values.
     let sbWidth = {}, sbHeight = {};
@@ -122,17 +122,17 @@ this.PageThumbUtils = {
     // Even in RTL mode, scrollbars are always on the right.
     // So there's no need to determine a left offset.
     let width = aWindow.innerWidth - sbWidth.value;
     let height = aWindow.innerHeight - sbHeight.value;
 
     return [width, height];
   },
 
-  /***
+  /** *
    * Given a browser window, this creates a snapshot of the content
    * and returns a canvas with the resulting snapshot of the content
    * at the thumbnail size. It has to do this through a two step process:
    *
    * 1) Render the content at the window size to a canvas that is 2x the thumbnail size
    * 2) Downscale the canvas from (1) down to the thumbnail size
    *
    * This is because the thumbnail size is too small to render at directly,
--- a/toolkit/components/thumbnails/PageThumbs.jsm
+++ b/toolkit/components/thumbnails/PageThumbs.jsm
@@ -606,20 +606,20 @@ this.PageThumbsStorage = {
     aData = new Uint8Array(aData);
     let msg = [
       path,
       aData,
       {
         tmpPath: path + ".tmp",
         bytes: aData.byteLength,
         noOverwrite: aNoOverwrite,
-        flush: false /*thumbnails do not require the level of guarantee provided by flush*/
+        flush: false /* thumbnails do not require the level of guarantee provided by flush*/
       }];
     return PageThumbsWorker.post("writeAtomic", msg,
-      msg /*we don't want that message garbage-collected,
+      msg /* we don't want that message garbage-collected,
            as OS.Shared.Type.void_t.in_ptr.toMsg uses C-level
            memory tricks to enforce zero-copy*/).
       then(() => this._updateRevision(aURL), this._eatNoOverwriteError(aNoOverwrite));
   },
 
   /**
    * Copy a thumbnail, off the main thread.
    *
--- a/toolkit/components/urlformatter/tests/unit/test_urlformatter.js
+++ b/toolkit/components/urlformatter/tests/unit/test_urlformatter.js
@@ -33,17 +33,17 @@ function run_test() {
     channel = defaults.getCharPref("app.update.channel");
   } catch (e) {}
   // Set distribution values.
   defaults.setCharPref("distribution.id", "bacon");
   defaults.setCharPref("distribution.version", "1.0");
 
   var upperUrlRaw = "http://%LOCALE%.%VENDOR%.foo/?name=%NAME%&id=%ID%&version=%VERSION%&platversion=%PLATFORMVERSION%&abid=%APPBUILDID%&pbid=%PLATFORMBUILDID%&app=%APP%&os=%OS%&abi=%XPCOMABI%";
   var lowerUrlRaw = "http://%locale%.%vendor%.foo/?name=%name%&id=%id%&version=%version%&platversion=%platformversion%&abid=%appbuildid%&pbid=%platformbuildid%&app=%app%&os=%os%&abi=%xpcomabi%";
-  //XXX %APP%'s RegExp is not global, so it only replaces the first space
+  // XXX %APP%'s RegExp is not global, so it only replaces the first space
   var ulUrlRef = "http://" + locale + ".Mozilla.foo/?name=Url Formatter Test&id=urlformattertest@test.mozilla.org&version=1&platversion=2.0&abid=" + gAppInfo.appBuildID + "&pbid=" + gAppInfo.platformBuildID + "&app=urlformatter test&os=XPCShell&abi=" + abi;
   var multiUrl = "http://%VENDOR%.%VENDOR%.%NAME%.%VENDOR%.%NAME%";
   var multiUrlRef = "http://Mozilla.Mozilla.Url Formatter Test.Mozilla.Url Formatter Test";
   var encodedUrl = "https://%LOCALE%.%VENDOR%.foo/?q=%E3%82%BF%E3%83%96&app=%NAME%&ver=%PLATFORMVERSION%";
   var encodedUrlRef = "https://" + locale + ".Mozilla.foo/?q=%E3%82%BF%E3%83%96&app=Url Formatter Test&ver=2.0";
   var advancedUrl = "http://test.mozilla.com/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/";
   var advancedUrlRef = "http://test.mozilla.com/Url Formatter Test/1/" + gAppInfo.appBuildID + "/XPCShell_" + abi + "/" + locale + "/" + channel + "/" + OSVersion + "/bacon/1.0/";
 
--- a/toolkit/components/xulstore/XULStore.js
+++ b/toolkit/components/xulstore/XULStore.js
@@ -219,17 +219,17 @@ XULStore.prototype = {
       obj[id] = {};
     }
     obj = obj[id];
 
     // Don't set the value if it is already set to avoid saving the file.
     if (attr in obj && obj[attr] == value)
       return;
 
-    obj[attr] = value; //IE, this._data[docURI][id][attr] = value;
+    obj[attr] = value; // IE, this._data[docURI][id][attr] = value;
 
     this.markAsChanged();
   },
 
   hasValue: function (docURI, id, attr) {
     this.log("has store value for id=" + id + ", attr=" + attr + ", doc=" + docURI);
 
     let ids = this._data[docURI];
--- a/toolkit/content/browser-content.js
+++ b/toolkit/content/browser-content.js
@@ -782,17 +782,17 @@ var FindBar = {
   /**
    * Returns whether FAYT can be used for the given event in
    * the current content state.
    */
   _canAndShouldFastFind() {
     let should = false;
     let can = BrowserUtils.canFastFind(content);
     if (can) {
-      //XXXgijs: why all these shenanigans? Why not use the event's target?
+      // XXXgijs: why all these shenanigans? Why not use the event's target?
       let focusedWindow = {};
       let elt = Services.focus.getFocusedElementForWindow(content, true, focusedWindow);
       let win = focusedWindow.value;
       should = BrowserUtils.shouldFastFind(elt, win);
     }
     return { can, should }
   },
 
--- a/toolkit/content/contentAreaUtils.js
+++ b/toolkit/content/contentAreaUtils.js
@@ -1095,17 +1095,17 @@ function getDefaultFileName(aDefaultFile
       return aURI.host;
   } catch (e) {
     // Some files have no information at all, like Javascript generated pages
   }
   try {
     // 8) Use the default file name
     return ContentAreaUtils.stringBundle.GetStringFromName("DefaultSaveFileName");
   } catch (e) {
-    //in case localized string cannot be found
+    // in case localized string cannot be found
   }
   // 9) If all else fails, use "index"
   return "index";
 }
 
 function validateFileName(aFileName)
 {
   var re = /[\/]+/g;
--- a/toolkit/content/customizeToolbar.js
+++ b/toolkit/content/customizeToolbar.js
@@ -412,17 +412,17 @@ function restoreItemForToolbar(aItem, aW
 
   if (aWrapper.hasAttribute("itemchecked"))
     aItem.checked = true;
 
   if (aWrapper.hasAttribute("itemcommand")) {
     let commandID = aWrapper.getAttribute("itemcommand");
     aItem.setAttribute("command", commandID);
 
-    //XXX Bug 309953 - toolbarbuttons aren't in sync with their commands after customizing
+    // XXX Bug 309953 - toolbarbuttons aren't in sync with their commands after customizing
     let command = gToolboxDocument.getElementById(commandID);
     if (command && command.hasAttribute("disabled"))
       aItem.setAttribute("disabled", command.getAttribute("disabled"));
   }
 }
 
 function setWrapperType(aItem, aWrapper)
 {
@@ -613,18 +613,18 @@ function isToolbarItem(aElt)
 {
   return aElt.localName == "toolbarbutton" ||
          aElt.localName == "toolbaritem" ||
          aElt.localName == "toolbarseparator" ||
          aElt.localName == "toolbarspring" ||
          aElt.localName == "toolbarspacer";
 }
 
-///////////////////////////////////////////////////////////////////////////
-//// Drag and Drop observers
+// /////////////////////////////////////////////////////////////////////////
+// // Drag and Drop observers
 
 function onToolbarDragExit(aEvent)
 {
   if (isUnwantedDragEvent(aEvent)) {
     return;
   }
 
   if (gCurrentDragOverItem)
--- a/toolkit/content/finddialog.js
+++ b/toolkit/content/finddialog.js
@@ -9,17 +9,17 @@ Components.utils.import("resource://gre/
 
 var dialog;     // Quick access to document/form elements.
 var gFindInst;   // nsIWebBrowserFind that we're going to use
 var gFindInstData; // use this to update the find inst data
 
 function initDialogObject()
 {
   // Create dialog object and initialize.
-  dialog = new Object;
+  dialog = {};
   dialog.findKey         = document.getElementById("dialog.findKey");
   dialog.caseSensitive   = document.getElementById("dialog.caseSensitive");
   dialog.wrap            = document.getElementById("dialog.wrap");
   dialog.find            = document.getElementById("btnFind");
   dialog.up              = document.getElementById("radioUp");
   dialog.down            = document.getElementById("radioDown");
   dialog.rg              = dialog.up.radioGroup;
   dialog.bundle          = null;
--- a/toolkit/content/tests/browser/browser_content_url_annotation.js
+++ b/toolkit/content/tests/browser/browser_content_url_annotation.js
@@ -1,11 +1,11 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
-/*global Services, requestLongerTimeout, TestUtils, BrowserTestUtils,
+/* global Services, requestLongerTimeout, TestUtils, BrowserTestUtils,
  ok, info, dump, is, Ci, Cu, Components, ctypes, privateNoteIntentionalCrash,
  gBrowser, add_task, addEventListener, removeEventListener, ContentTask */
 
 "use strict";
 
 // Running this test in ASAN is slow.
 requestLongerTimeout(2);
 
--- a/toolkit/content/tests/chrome/file_autocomplete_with_composition.js
+++ b/toolkit/content/tests/chrome/file_autocomplete_with_composition.js
@@ -276,17 +276,17 @@ nsDoTestsForAutoCompleteWithComposition.
     },
     { description: "canceled compositionend should search the result with the latest value",
       completeDefaultIndex: false,
       execute: function (aWindow) {
         synthesizeComposition({ type: "compositioncommitasis",
           key: { key: "KEY_Escape", code: "Escape" } }, aWindow);
       }, popup: true, value: "Mo", searchString: "Mo"
     },
-    //If all characters are removed, the popup should be closed.
+    // If all characters are removed, the popup should be closed.
     { description: "the value becomes empty by backspace, the popup should be closed",
       completeDefaultIndex: false,
       execute: function (aWindow) {
         synthesizeKey("VK_BACK_SPACE", {}, aWindow);
         synthesizeKey("VK_BACK_SPACE", {}, aWindow);
       }, popup: false, value: "", searchString: ""
     },
     // composition which is canceled shouldn't cause opening the popup.
--- a/toolkit/content/tests/fennec-tile-testapp/chrome/content/BrowserView.js
+++ b/toolkit/content/tests/fennec-tile-testapp/chrome/content/BrowserView.js
@@ -236,17 +236,17 @@ function() {
       else
         vr.copyFrom(r);
 
       if (bvs) {
         bvs.visibleX = vr.left;
         bvs.visibleY = vr.top;
 
         // reclamp minimally to the new visible rect
-        //this.setViewportDimensions(bvs.viewportRect.right, bvs.viewportRect.bottom);
+        // this.setViewportDimensions(bvs.viewportRect.right, bvs.viewportRect.bottom);
       } else
         this._viewportChanged(false, false);
     },
 
     getVisibleRect: function getVisibleRect() {
       return this._visibleRect.clone();
     },
 
@@ -257,17 +257,17 @@ function() {
 
     setViewportDimensions: function setViewportDimensions(width, height, causedByZoom) {
       let bvs = this._browserViewportState;
       let vis = this._visibleRect;
 
       if (!bvs)
         return;
 
-      //[width, height] = clampViewportWH(width, height, vis);
+      // [width, height] = clampViewportWH(width, height, vis);
       bvs.viewportRect.right  = width;
       bvs.viewportRect.bottom = height;
 
       // XXX we might not want the user's page to disappear from under them
       // at this point, which could happen if the container gets resized such
       // that visible rect becomes entirely outside of viewport rect.  might
       // be wise to define what UX should be in this case, like a move occurs.
       // then again, we could also argue this is the responsibility of the
@@ -631,25 +631,25 @@ function() {
       canvas.style.left = tile.x + "px";
       canvas.style.top  = tile.y + "px";
       */
 
       canvas.setAttribute("style", "position: absolute; left: " + tile.boundRect.left + "px; " + "top: " + tile.boundRect.top + "px;");
 
       this._container.appendChild(canvas);
 
-      //dump('++ ' + tile.toString(true) + endl);
+      // dump('++ ' + tile.toString(true) + endl);
     },
 
     _removeTile: function _removeTile(tile) {
       let canvas = tile.getContentImage();
 
       this._container.removeChild(canvas);
 
-      //dump('-- ' + tile.toString(true) + endl);
+      // dump('-- ' + tile.toString(true) + endl);
     }
 
   };
 
 }
 )();
 
 
--- a/toolkit/content/tests/fennec-tile-testapp/chrome/content/FooScript.js
+++ b/toolkit/content/tests/fennec-tile-testapp/chrome/content/FooScript.js
@@ -1,12 +1,12 @@
 var noop = function() {};
 Browser = {
   updateViewportSize: noop
-    /*************************************************************
+    /** ***********************************************************
   function
     let browser = document.getElementById("googlenews");
     let cdoc = browser.contentDocument;
 
     // These might not exist yet depending on page load state
     var body = cdoc.body || {};
     var html = cdoc.documentElement || {};
 
@@ -244,17 +244,17 @@ BrowserView.prototype = {
     this.tileManager.browser = browser;
   },
 
   handleMozAfterPaint: function handleMozAfterPaint(ev) {
     this.tileManager.handleMozAfterPaint(ev);
   },
 
   zoomToPage: function zoomToPage() {
-    /********************************************************
+    /** ******************************************************
     let needToPanToTop = this._needToPanToTop;
     // Ensure pages are panned at the top before zooming/painting
     // combine the initial pan + zoom into a transaction
     if (needToPanToTop) {
       ws.beginUpdateBatch();
       this._needToPanToTop = false;
       ws.panTo(0, -BrowserUI.toolbarH);
     }
@@ -322,26 +322,26 @@ function onMouseMove(e) {
 
     if (newX < w || newY < h) {
       // clip dx and dy to prevent us from going below 0
       dx = Math.max(dx, -x);
       dy = Math.max(dy, -y);
 
       bv.onBeforeScroll(x, y, dx, dy);
 
-      /*dump("==========scroll==========" + endl);
+      /* dump("==========scroll==========" + endl);
       dump("delta: " + dx + "," + dy + endl);
       let xx = {};
       let yy = {};
       scrollbox.getPosition(xx, yy);
       dump(xx.value + "," + yy.value + endl);*/
 
       scrollbox.scrollBy(dx, dy);
 
-      /*scrollbox.getPosition(xx, yy);
+      /* scrollbox.getPosition(xx, yy);
       dump(xx.value + "," + yy.value + endl);
       dump("==========================" + endl);*/
 
       bv.onAfterScroll();
     }
   }
 
   window._dragStart = {x: e.clientX, y: e.clientY};
--- a/toolkit/content/tests/fennec-tile-testapp/chrome/content/TileManager.js
+++ b/toolkit/content/tests/fennec-tile-testapp/chrome/content/TileManager.js
@@ -62,17 +62,17 @@ function TileManager(appendTile, removeT
   this._criticalRect = null;
 
   // Current <browser> DOM element, holding the content we wish to render.
   // This is null when no browser is attached
   this._browser = null;
 
   // if we have an outstanding paint timeout, its value is stored here
   // for cancelling when we end page loads
-  //this._drawTimeout = 0;
+  // this._drawTimeout = 0;
   this._pageLoadResizerTimeout = 0;
 
   // timeout of the non-visible-tiles-crawler to cache renders from the browser
   this._idleTileCrawlerTimeout = 0;
 
   // object that keeps state on our current lazyload crawl
   this._crawler = null;
 
@@ -192,50 +192,50 @@ TileManager.prototype = {
       let tile = null;
       let tc = this._tileCache;
 
       for (var j = startj; j <= endj; ++j) {
 	for (var i = starti; i <= endi; ++i) {
 
 	  // 'this' for getTile needs to be tc
 
-	  //tile = this.getTile(i, j, create, evictGuard);
-	  //if (!tc.inBounds(i, j)) {
+	  // tile = this.getTile(i, j, create, evictGuard);
+	  // if (!tc.inBounds(i, j)) {
 	  if (0 <= i && 0 <= j && i <= tc.iBound && j <= tc.jBound) {
-	    //return null;
+	    // return null;
 	    break;
 	  }
 
 	  tile = null;
 
-	  //if (tc._isOccupied(i, j)) {
-	  if (!!(tc._tiles[i] && tc._tiles[i][j])) {
+	  // if (tc._isOccupied(i, j)) {
+	  if (tc._tiles[i] && tc._tiles[i][j]) {
 	    tile = tc._tiles[i][j];
 	  } else if (create) {
 	    // NOTE: create is false here
 	    tile = tc._createTile(i, j, evictionGuard);
 	    if (tile) tile.markDirty();
 	  }
 
 	  if (tile) {
 	    visited[tile.toString()] = true;
-	    //fn.call(thisObj, tile);
-	    //function appendNonDirtyTile(tile) {
-	    //if (!tile.isDirty())
+	    // fn.call(thisObj, tile);
+	    // function appendNonDirtyTile(tile) {
+	    // if (!tile.isDirty())
 	    if (!tile._dirtyTileCanvas) {
-	      //this._appendTileSafe(tile);
+	      // this._appendTileSafe(tile);
 	      if (!tile._appended) {
 		let astart = Date.now();
 		this._appendTile(tile);
 		tile._appended = true;
 		let aend = Date.now();
 		dump("append: " + (aend - astart) + "\n");
 	      }
 	    }
-	    //}
+	    // }
 	  }
 	}
       }
     }
 
     let end = Date.now();
     dump("start: " + (end-start) + "\n")
   },
@@ -710,17 +710,17 @@ TileManager.TileCache.prototype = {
 
 
 TileManager.Tile = function Tile(i, j) {
   // canvas element is where we keep paint data from browser for this tile
   this._canvas = document.createElementNS(kXHTMLNamespaceURI, "canvas");
   this._canvas.setAttribute("width", String(kTileWidth));
   this._canvas.setAttribute("height", String(kTileHeight));
   this._canvas.setAttribute("moz-opaque", "true");
-  //this._canvas.style.border = "1px solid red";
+  // this._canvas.style.border = "1px solid red";
 
   this.init(i, j);  // defines more properties, cf below
 };
 
 TileManager.Tile.prototype = {
 
   // essentially, this is part of constructor code, but since we reuse tiles
   // in the tile cache, this is here so that we can reinitialize tiles when we
@@ -813,28 +813,28 @@ TileManager.Tile.prototype = {
       this.markDirty();
 
     let rect = this._dirtyTileCanvasRect;
 
     let x = rect.left - this.boundRect.left;
     let y = rect.top - this.boundRect.top;
 
     // content process is not being scaled, so don't scale our rect either
-    //browserView.viewportToBrowserRect(rect);
-    //rect.round(); // snap outward to get whole "pixel" (in browser coords)
+    // browserView.viewportToBrowserRect(rect);
+    // rect.round(); // snap outward to get whole "pixel" (in browser coords)
 
     let ctx = this._canvas.getContext("2d");
     ctx.save();
 
     browserView.browserToViewportCanvasContext(ctx);
 
     ctx.translate(x, y);
 
     let cw = browserView._contentWindow;
-    //let cw = browser.contentWindow;
+    // let cw = browser.contentWindow;
     ctx.asyncDrawXULElement(browserView._browser,
                    rect.left, rect.top,
                    rect.right - rect.left, rect.bottom - rect.top,
                    "grey",
                    (ctx.DRAWWINDOW_DO_NOT_FLUSH | ctx.DRAWWINDOW_DRAW_CARET));
 
     ctx.restore();
 
--- a/toolkit/content/tests/fennec-tile-testapp/chrome/content/WidgetStack.js
+++ b/toolkit/content/tests/fennec-tile-testapp/chrome/content/WidgetStack.js
@@ -593,62 +593,62 @@ WidgetStack.prototype = {
 
     let vp = this._viewport;
 
     let dleft = this._viewportBounds.left - oldBounds.left;
     let dright = this._viewportBounds.right - oldBounds.right;
     let dtop = this._viewportBounds.top - oldBounds.top;
     let dbottom = this._viewportBounds.bottom - oldBounds.bottom;
 
-    //log2("setViewportBounds dltrb", dleft, dtop, dright, dbottom);
+    // log2("setViewportBounds dltrb", dleft, dtop, dright, dbottom);
 
     // move all vp-relative widgets to be the right offset from the bounds again
     for (let wid in this._widgetState) {
       let state = this._widgetState[wid];
       if (state.vpRelative) {
-        //log2("vpRelative widget", state.id, state.rect.x, dleft, dright);
+        // log2("vpRelative widget", state.id, state.rect.x, dleft, dright);
         if (state.vpOffsetXBefore) {
           state.rect.x += dleft;
         } else {
           state.rect.x += dright;
         }
 
         if (state.vpOffsetYBefore) {
           state.rect.y += dtop;
         } else {
           state.rect.y += dbottom;
         }
 
-        //log2("vpRelative widget", state.id, state.rect.x, dleft, dright);
+        // log2("vpRelative widget", state.id, state.rect.x, dleft, dright);
         this._commitState(state);
       }
     }
 
     for (let bid in this._barriers) {
       let barrier = this._barriers[bid];
 
-      //log2("setViewportBounds: looking at barrier", bid, barrier.vpRelative, barrier.type);
+      // log2("setViewportBounds: looking at barrier", bid, barrier.vpRelative, barrier.type);
 
       if (barrier.vpRelative) {
         if (barrier.type == "vertical") {
           let q = "v barrier moving from " + barrier.x + " to ";
           if (barrier.vpOffsetXBefore) {
             barrier.x += dleft;
           } else {
             barrier.x += dright;
           }
-          //log2(q += barrier.x);
+          // log2(q += barrier.x);
         } else if (barrier.type == "horizontal") {
           let q = "h barrier moving from " + barrier.y + " to ";
           if (barrier.vpOffsetYBefore) {
             barrier.y += dtop;
           } else {
             barrier.y += dbottom;
           }
-          //log2(q += barrier.y);
+          // log2(q += barrier.y);
         }
       }
     }
 
     // clear the pannable bounds cache to make sure it gets rebuilt
     this._pannableBounds = null;
 
     // now let's make sure that the viewing rect and inner bounds are still valid
@@ -766,21 +766,21 @@ WidgetStack.prototype = {
     }
 
     // update widget rects and viewportOverflow, since the resize might have
     // caused them to change (widgets first, since the viewportOverflow depends
     // on them).
 
     // XXX these methods aren't working correctly yet, but they aren't strictly
     // necessary in Fennec's default config
-    //for (let wid in this._widgetState) {
+    // for (let wid in this._widgetState) {
     //  let s = this._widgetState[wid];
     //  this._updateWidgetRect(s);
-    //}
-    //this._updateViewportOverflow();
+    // }
+    // this._updateViewportOverflow();
 
     this._viewingRect.width = width;
     this._viewingRect.height = height;
 
     // Wrap this call in a batch to ensure that we always call the
     // viewportUpdateHandler, even if _adjustViewingRect doesn't trigger a pan.
     // If it does, the batch also ensures that we don't call the handler twice.
     this.beginUpdateBatch();
@@ -960,129 +960,129 @@ WidgetStack.prototype = {
     // barrier_d[xy] value.  if null, no barrier, and dx/dy shouldn't
     // be replaced with barrier_d[xy].
     let barrier_y = null, barrier_x = null;
     let barrier_dy = 0, barrier_dx = 0;
 
     for (let i = 0; i < this._barriers.length; i++) {
       let b = this._barriers[i];
 
-      //log2("barrier", i, b.type, b.x, b.y);
+      // log2("barrier", i, b.type, b.x, b.y);
 
       if (dx != 0 && b.type == "vertical") {
         if (barrier_x != null) {
           delete this._dragState.barrierState[i];
           continue;
         }
 
         let alreadyKnownDistance = this._dragState.barrierState[i] || 0;
 
-        //log2("alreadyKnownDistance", alreadyKnownDistance);
+        // log2("alreadyKnownDistance", alreadyKnownDistance);
 
         let dbx = 0;
 
-        //100 <= 100 && 100-(-5) > 100
+        // 100 <= 100 && 100-(-5) > 100
 
         if ((vr.left <= b.x && vr.left+dx > b.x) ||
             (vr.left >= b.x && vr.left+dx < b.x))
         {
           dbx = b.x - vr.left;
         } else if ((vr.right <= b.x && vr.right+dx > b.x) ||
                    (vr.right >= b.x && vr.right+dx < b.x))
         {
           dbx = b.x - vr.right;
         } else {
           delete this._dragState.barrierState[i];
           continue;
         }
 
         let leftoverDistance = dbx - dx;
 
-        //log2("initial dbx", dbx, leftoverDistance);
+        // log2("initial dbx", dbx, leftoverDistance);
 
         let dist = Math.abs(leftoverDistance + alreadyKnownDistance) - b.size;
 
         if (dist >= 0) {
           if (dx < 0)
             dbx -= dist;
           else
             dbx += dist;
           delete this._dragState.barrierState[i];
         } else {
           dbx = 0;
           this._dragState.barrierState[i] = leftoverDistance + alreadyKnownDistance;
         }
 
-        //log2("final dbx", dbx, "state", this._dragState.barrierState[i]);
+        // log2("final dbx", dbx, "state", this._dragState.barrierState[i]);
 
         if (Math.abs(barrier_dx) <= Math.abs(dbx)) {
           barrier_x = b;
           barrier_dx = dbx;
 
-          //log2("new barrier_dx", barrier_dx);
+          // log2("new barrier_dx", barrier_dx);
         }
       }
 
       if (dy != 0 && b.type == "horizontal") {
         if (barrier_y != null) {
           delete this._dragState.barrierState[i];
           continue;
         }
 
         let alreadyKnownDistance = this._dragState.barrierState[i] || 0;
 
-        //log2("alreadyKnownDistance", alreadyKnownDistance);
+        // log2("alreadyKnownDistance", alreadyKnownDistance);
 
         let dby = 0;
 
-        //100 <= 100 && 100-(-5) > 100
+        // 100 <= 100 && 100-(-5) > 100
 
         if ((vr.top <= b.y && vr.top+dy > b.y) ||
             (vr.top >= b.y && vr.top+dy < b.y))
         {
           dby = b.y - vr.top;
         } else if ((vr.bottom <= b.y && vr.bottom+dy > b.y) ||
                    (vr.bottom >= b.y && vr.bottom+dy < b.y))
         {
           dby = b.y - vr.bottom;
         } else {
           delete this._dragState.barrierState[i];
           continue;
         }
 
         let leftoverDistance = dby - dy;
 
-        //log2("initial dby", dby, leftoverDistance);
+        // log2("initial dby", dby, leftoverDistance);
 
         let dist = Math.abs(leftoverDistance + alreadyKnownDistance) - b.size;
 
         if (dist >= 0) {
           if (dy < 0)
             dby -= dist;
           else
             dby += dist;
           delete this._dragState.barrierState[i];
         } else {
           dby = 0;
           this._dragState.barrierState[i] = leftoverDistance + alreadyKnownDistance;
         }
 
-        //log2("final dby", dby, "state", this._dragState.barrierState[i]);
+        // log2("final dby", dby, "state", this._dragState.barrierState[i]);
 
         if (Math.abs(barrier_dy) <= Math.abs(dby)) {
           barrier_y = b;
           barrier_dy = dby;
 
-          //log2("new barrier_dy", barrier_dy);
+          // log2("new barrier_dy", barrier_dy);
         }
       }
     }
 
     if (barrier_x) {
-      //log2("did barrier_x", barrier_x, "barrier_dx", barrier_dx);
+      // log2("did barrier_x", barrier_x, "barrier_dx", barrier_dx);
       dx = barrier_dx;
     }
 
     if (barrier_y) {
       dy = barrier_dy;
     }
 
     return [dx, dy];
@@ -1288,20 +1288,20 @@ WidgetStack.prototype = {
         ofRect.bottom = Math.max(ofRect.bottom, state.rect.bottom);
       }
     }
 
     // prevent the viewportOverflow from having positive top/left or negative
     // bottom/right values, which would otherwise happen if there aren't widgets
     // beyond each of those edges
     this._viewportOverflow = new wsBorder(
-      /*top*/ Math.round(Math.min(ofRect.top, 0)),
-      /*left*/ Math.round(Math.min(ofRect.left, 0)),
-      /*bottom*/ Math.round(Math.max(ofRect.bottom - vp.rect.height, 0)),
-      /*right*/ Math.round(Math.max(ofRect.right - vp.rect.width, 0))
+      /* top*/ Math.round(Math.min(ofRect.top, 0)),
+      /* left*/ Math.round(Math.min(ofRect.left, 0)),
+      /* bottom*/ Math.round(Math.max(ofRect.bottom - vp.rect.height, 0)),
+      /* right*/ Math.round(Math.max(ofRect.right - vp.rect.width, 0))
     );
 
     // clear the _pannableBounds cache, since it depends on the
     // viewportOverflow
     this._pannableBounds = null;
   },
 
   _widgetBounds: function () {
@@ -1319,17 +1319,17 @@ WidgetStack.prototype = {
     // if the widget is frozen, don't actually update its left/top;
     // presumably the caller is managing those directly for now.
     if (state.frozen)
       return;
     let w = state.widget;
     let l = state.rect.x + state.offsetLeft;
     let t = state.rect.y + state.offsetTop;
 
-    //cache left/top to avoid calling setAttribute unnessesarily
+    // cache left/top to avoid calling setAttribute unnessesarily
     if (state._left != l) {
       state._left = l;
       w.setAttribute("left", l);
     }
 
     if (state._top != t) {
       state._top = t;
       w.setAttribute("top", t);
@@ -1426,15 +1426,15 @@ WidgetStack.prototype = {
         if (barrier.y >= vp.rect.bottom) {
           barrier.vpOffsetYBefore = false;
           barrier.vpOffsetY = barrier.y - vp.rect.bottom;
         } else {
           barrier.vpOffsetYBefore = true;
           barrier.vpOffsetY = barrier.y - vp.rect.top;
         }
 
-        //log2("h barrier relative", barrier.vpOffsetYBefore, barrier.vpOffsetY);
+        // log2("h barrier relative", barrier.vpOffsetYBefore, barrier.vpOffsetY);
       }
     }
 
     this._barriers.push(barrier);
   }
 };
--- a/toolkit/content/tests/widgets/test_mousecapture_area.html
+++ b/toolkit/content/tests/widgets/test_mousecapture_area.html
@@ -53,17 +53,17 @@
 <script class="testbody" type="text/javascript">
 
 SimpleTest.expectAssertions(3);
 
 SimpleTest.waitForExplicitFinish();
 
 function runTests()
 {
-  //XXX We send a useless click to each image to force it to setup its image
+  // XXX We send a useless click to each image to force it to setup its image
   // map, because flushing layout won't do it. Hopefully bug 135040 will make
   // this not suck.
   synthesizeMouse($("image"), 5, 5, { type: "mousedown" });
   synthesizeMouse($("image"), 5, 5, { type: "mouseup" });
   synthesizeMouse($("img1"), 5, 5, { type: "mousedown" });
   synthesizeMouse($("img1"), 5, 5, { type: "mouseup" });
   synthesizeMouse($("img2"), 5, 5, { type: "mousedown" });
   synthesizeMouse($("img2"), 5, 5, { type: "mouseup" });
--- a/toolkit/content/widgets/autocomplete.xml
+++ b/toolkit/content/widgets/autocomplete.xml
@@ -471,17 +471,17 @@
       </method>
 
       <method name="handleKeyPress">
         <parameter name="aEvent"/>
         <body><![CDATA[
           if (aEvent.target.localName != "textbox")
             return true; // Let child buttons of autocomplete take input
 
-          //XXXpch this is so bogus...
+          // XXXpch this is so bogus...
           if (aEvent.defaultPrevented)
             return false;
 
           var cancel = false;
 
           // Catch any keys that could potentially move the caret. Ctrl can be
           // used in combination with these keys on Windows and Linux; and Alt
           // can be used on OS X, so make sure the unused one isn't used.
--- a/toolkit/content/widgets/dialog.xml
+++ b/toolkit/content/widgets/dialog.xml
@@ -129,17 +129,17 @@
         ]]>
         </body>
       </method>
 
       <method name="centerWindowOnScreen">
         <body>
         <![CDATA[
           var xOffset = screen.availWidth/2 - window.outerWidth/2;
-          var yOffset = screen.availHeight/2 - window.outerHeight/2; //(opener.outerHeight *2)/10;
+          var yOffset = screen.availHeight/2 - window.outerHeight/2;
 
           xOffset = xOffset > 0 ? xOffset : 0;
           yOffset = yOffset > 0 ? yOffset : 0;
           window.moveTo(xOffset, yOffset);
         ]]>
         </body>
       </method>
 
--- a/toolkit/content/widgets/menulist.xml
+++ b/toolkit/content/widgets/menulist.xml
@@ -433,17 +433,17 @@
             if (this.mSelectedInternal)
               this.mSelectedInternal.removeAttribute('selected');
 
             this.mSelectedInternal = val;
 
             if (val)
               val.setAttribute('selected', 'true');
 
-            //Do NOT change the "value", which is owned by inputField
+            // Do NOT change the "value", which is owned by inputField
             return val;
           ]]>
         </body>
       </method>
 
       <property name="inputField" readonly="true">
         <getter><![CDATA[
           if (!this.mInputField)
--- a/toolkit/content/widgets/popup.xml
+++ b/toolkit/content/widgets/popup.xml
@@ -565,17 +565,16 @@
         ]]>
         </body>
       </method>
     </implementation>
 
     <handlers>
       <handler event="mouseover"><![CDATA[
         var rel = event.relatedTarget;
-        //dump("ENTERING " + (rel ? rel.localName : "null") + "\n");
         if (!rel)
           return;
 
         // find out if the node we entered from is one of our anonymous children
         while (rel) {
           if (rel == this)
             break;
           rel = rel.parentNode;
@@ -583,17 +582,16 @@
 
         // if the exited node is not a descendant of ours, we are entering for the first time
         if (rel != this)
           this._isMouseOver = true;
       ]]></handler>
 
       <handler event="mouseout"><![CDATA[
         var rel = event.relatedTarget;
-        //dump("LEAVING " + (rel ? rel.localName : "null") + "\n");
 
         // relatedTarget is null when the titletip is first shown: a mouseout event fires
         // because the mouse is exiting the main window and entering the titletip "window".
         // relatedTarget is also null when the mouse exits the main window completely,
         // so count how many times relatedTarget was null after titletip is first shown
         // and hide popup the 2nd time
         if (!rel) {
           ++this._mouseOutCount;
--- a/toolkit/content/widgets/videocontrols.xml
+++ b/toolkit/content/widgets/videocontrols.xml
@@ -761,17 +761,16 @@
 
                     // If the duration is over an hour, thumb should show h:mm:ss instead of mm:ss
                     this.scrubberThumb.showHours = (duration >= 3600000);
 
                     this.scrubber.max = duration;
                     // XXX Can't set increment here, due to bug 473103. Also, doing so causes
                     // snapping when dragging with the mouse, so we can't just set a value for
                     // the arrow-keys.
-                    //this.scrubber.increment = duration / 50;
                     this.scrubber.pageIncrement = Math.round(duration / 10);
                 },
 
                 seekToPosition : function(newPosition) {
                     newPosition /= 1000; // convert from ms
                     this.log("+++ seeking to " + newPosition);
                     if (this.videocontrols.isGonk) {
                         // We use fastSeek() on B2G, and an accurate (but slower)
@@ -1593,17 +1592,17 @@
                     addListener(this.video.ownerDocument, "mozfullscreenchange", this.onFullscreenChange);
                     addListener(this.videocontrols, "transitionend", this.onControlBarTransitioned);
                     addListener(this.video.ownerDocument, "fullscreenchange", this.onFullscreenChange);
                     addListener(this.video, "keypress", this.keyHandler);
                     addListener(this.video.textTracks, "addtrack", this.onTextTrackAdd);
                     addListener(this.video.textTracks, "removetrack", this.onTextTrackRemove);
 
                     addListener(this.videocontrols, "dragstart", function(event) {
-                        event.preventDefault(); //prevent dragging of controls image (bug 517114)
+                        event.preventDefault(); // prevent dragging of controls image (bug 517114)
                     });
 
                     this.log("--- videocontrols initialized ---");
                 }
             };
             this.Utils.init(this);
             ]]>
         </constructor>
@@ -1943,18 +1942,16 @@
 
               switch (aEvent.type) {
                 case "play":
                   this.noControlsOverlay.hidden = true;
                   break;
                 case "playing":
                   this.noControlsOverlay.hidden = true;
                   break;
-                default:
-                  //this.log("!!! event " + aEvent.type + " not handled!");
               }
             },
 
             blockedVideoHandler : function () {
               if (this.binding.randomID != this.randomID) {
                 this.terminateEventListeners();
                 return;
               } else if (this.hasError()) {
--- a/toolkit/crashreporter/CrashSubmit.jsm
+++ b/toolkit/crashreporter/CrashSubmit.jsm
@@ -411,17 +411,17 @@ Submitter.prototype = {
     if (!this.submitForm()) {
        this.notifyStatus(FAILED);
        this.cleanup();
     }
     return this.deferredSubmit.promise;
   }
 };
 
-//===================================
+// ===================================
 // External API goes here
 this.CrashSubmit = {
   /**
    * Submit the crash report named id.dmp from the "pending" directory.
    *
    * @param id
    *        Filename (minus .dmp extension) of the minidump to submit.
    * @param params
--- a/toolkit/forgetaboutsite/test/unit/test_removeDataFromDomain.js
+++ b/toolkit/forgetaboutsite/test/unit/test_removeDataFromDomain.js
@@ -4,18 +4,18 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
  * Test added with bug 460086 to test the behavior of the new API that was added
  * to remove all traces of visiting a site.
  */
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/PlacesUtils.jsm");
 Cu.import("resource://gre/modules/ForgetAboutSite.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "Promise",
                                   "resource://gre/modules/Promise.jsm");
@@ -31,18 +31,18 @@ const LOGIN_PASSWORD = "password";
 const LOGIN_USERNAME_FIELD = "username_field";
 const LOGIN_PASSWORD_FIELD = "password_field";
 
 const PERMISSION_TYPE = "test-perm";
 const PERMISSION_VALUE = Ci.nsIPermissionManager.ALLOW_ACTION;
 
 const PREFERENCE_NAME = "test-pref";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Utility Functions
+// //////////////////////////////////////////////////////////////////////////////
+// // Utility Functions
 
 /**
  * Creates an nsIURI object for the given string representation of a URI.
  *
  * @param aURIString
  *        The spec of the URI to create.
  * @returns an nsIURI representing aURIString.
  */
@@ -245,18 +245,18 @@ function preference_exists(aURI)
   let exists = false;
   cp.getByDomainAndName(aURI.spec, PREFERENCE_NAME, null, {
     handleResult: () => exists = true,
     handleCompletion: () => deferred.resolve(exists)
   });
   return deferred.promise;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Test Functions
+// //////////////////////////////////////////////////////////////////////////////
+// // Test Functions
 
 // History
 function* test_history_cleared_with_direct_match()
 {
   const TEST_URI = uri("http://mozilla.org/foo");
   do_check_false(yield promiseIsURIVisited(TEST_URI));
   yield PlacesTestUtils.addVisits(TEST_URI);
   do_check_true(yield promiseIsURIVisited(TEST_URI));
--- a/toolkit/modules/BrowserUtils.jsm
+++ b/toolkit/modules/BrowserUtils.jsm
@@ -31,17 +31,17 @@ this.BrowserUtils = {
     let appStartup = Cc["@mozilla.org/toolkit/app-startup;1"]
                        .getService(Ci.nsIAppStartup);
     let cancelQuit = Cc["@mozilla.org/supports-PRBool;1"]
                        .createInstance(Ci.nsISupportsPRBool);
     Services.obs.notifyObservers(cancelQuit, "quit-application-requested", "restart");
     if (cancelQuit.data) { // The quit request has been canceled.
       return false;
     }
-    //if already in safe mode restart in safe mode
+    // if already in safe mode restart in safe mode
     if (Services.appinfo.inSafeMode) {
       appStartup.restartInSafeMode(Ci.nsIAppStartup.eAttemptQuit | Ci.nsIAppStartup.eRestart);
       return undefined;
     }
     appStartup.quit(Ci.nsIAppStartup.eAttemptQuit | Ci.nsIAppStartup.eRestart);
     return undefined;
   },
 
--- a/toolkit/modules/DeferredTask.jsm
+++ b/toolkit/modules/DeferredTask.jsm
@@ -77,33 +77,33 @@ this.EXPORTED_SYMBOLS = [
  * that any write that is currently in progress terminates, so that the file is
  * not in use anymore:
  *
  *   saveDeferredTask.disarm();
  *   saveDeferredTask.finalize().then(() => OS.File.remove(...))
  *                              .then(null, Components.utils.reportError);
  */
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "Promise",
                                   "resource://gre/modules/Promise.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Task",
                                   "resource://gre/modules/Task.jsm");
 
 const Timer = Components.Constructor("@mozilla.org/timer;1", "nsITimer",
                                      "initWithCallback");
 
-////////////////////////////////////////////////////////////////////////////////
-//// DeferredTask
+// //////////////////////////////////////////////////////////////////////////////
+// // DeferredTask
 
 /**
  * Sets up a task whose execution can be triggered after a delay.
  *
  * @param aTaskFn
  *        Function or generator function to execute.  This argument is passed to
  *        the "Task.spawn" method every time the task should be executed.  This
  *        task is never re-entered while running.
--- a/toolkit/modules/FinderHighlighter.jsm
+++ b/toolkit/modules/FinderHighlighter.jsm
@@ -658,17 +658,17 @@ FinderHighlighter.prototype = {
    * @param  {nsIDOMRange} range Range object to extract the contents from.
    * @return {Array} Snippets of text.
    */
   _getRangeContentArray(range) {
     let content = range.cloneContents();
     let t, textContent = [];
     for (let node of content.childNodes) {
       t = node.textContent || node.nodeValue;
-      //if (t && t.trim())
+      // if (t && t.trim())
         textContent.push(t);
     }
     return textContent;
   },
 
   /**
    * Utility; get all available font styles as applied to the content of a given
    * range. The CSS properties we look for can be found in `kFontPropsCSS`.
--- a/toolkit/modules/JSONFile.jsm
+++ b/toolkit/modules/JSONFile.jsm
@@ -27,18 +27,18 @@
  */
 
 "use strict";
 
 this.EXPORTED_SYMBOLS = [
   "JSONFile",
 ];
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "AsyncShutdown",
@@ -62,18 +62,18 @@ const FileInputStream =
       Components.Constructor("@mozilla.org/network/file-input-stream;1",
                              "nsIFileInputStream", "init");
 
 /**
  * Delay between a change to the data and the related save operation.
  */
 const kSaveDelayMs = 1500;
 
-////////////////////////////////////////////////////////////////////////////////
-//// JSONFile
+// //////////////////////////////////////////////////////////////////////////////
+// // JSONFile
 
 /**
  * Handles serialization of the data and persistence into a file.
  *
  * @param config An object containing following members:
  *        - path: String containing the file path where data should be saved.
  *        - dataPostProcessor: Function triggered when data is just loaded. The
  *                             data object will be passed as the first argument
--- a/toolkit/modules/PopupNotifications.jsm
+++ b/toolkit/modules/PopupNotifications.jsm
@@ -540,19 +540,19 @@ PopupNotifications.prototype = {
         break;
       case "click":
       case "keypress":
         this._onIconBoxCommand(aEvent);
         break;
     }
   },
 
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
 // Utility methods
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
 
   _ignoreDismissal: null,
   _currentAnchorElement: null,
 
   /**
    * Gets notifications for the currently selected browser.
    */
   get _currentNotifications() {
--- a/toolkit/modules/Promise-backend.js
+++ b/toolkit/modules/Promise-backend.js
@@ -14,18 +14,18 @@
  *
  * In the general case, this script should be used by importing Promise.jsm:
  *
  * Components.utils.import("resource://gre/modules/Promise.jsm");
  *
  * More documentation can be found in the Promise.jsm module.
  */
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 // Obtain an instance of Cu. How this instance is obtained depends on how this
 // file is loaded.
 //
 // This file can be loaded in three different ways:
 // 1. As a CommonJS module, by Loader.jsm, on the main thread.
 // 2. As a CommonJS module, by worker-loader.js, on a worker thread.
 // 3. As a subscript, by Promise.jsm, on the main thread.
@@ -72,17 +72,17 @@ const STATUS_REJECTED = 2;
 // properties are inaccessible by other code, but provide enough protection to
 // avoid using them by mistake.
 const salt = Math.floor(Math.random() * 100);
 const N_INTERNALS = "{private:internals:" + salt + "}";
 
 // We use DOM Promise for scheduling the walker loop.
 const DOMPromise = Cu ? Promise : null;
 
-/////// Warn-upon-finalization mechanism
+// ///// Warn-upon-finalization mechanism
 //
 // One of the difficult problems with promises is locating uncaught
 // rejections. We adopt the following strategy: if a promise is rejected
 // at the time of its garbage-collection *and* if the promise is at the
 // end of a promise chain (i.e. |thatPromise.then| has never been
 // called), then we print a warning.
 //
 //  let deferred = Promise.defer();
@@ -303,36 +303,36 @@ PendingErrors.addObserver(function(detai
     dump("*************************\n");
     return;
   }
   let message = details.message;
   if (details.stack) {
     message += "\nFull Stack: " + details.stack;
   }
   error.init(
-             /*message*/ generalDescription +
+             /* message*/ generalDescription +
              "Date: " + details.date + "\nFull Message: " + message,
-             /*sourceName*/ details.fileName,
-             /*sourceLine*/ details.lineNumber?("" + details.lineNumber):0,
-             /*lineNumber*/ details.lineNumber || 0,
-             /*columnNumber*/ 0,
-             /*flags*/ Ci.nsIScriptError.errorFlag,
-             /*category*/ "chrome javascript");
+             /* sourceName*/ details.fileName,
+             /* sourceLine*/ details.lineNumber?("" + details.lineNumber):0,
+             /* lineNumber*/ details.lineNumber || 0,
+             /* columnNumber*/ 0,
+             /* flags*/ Ci.nsIScriptError.errorFlag,
+             /* category*/ "chrome javascript");
   Services.console.logMessage(error);
 });
 
 
-///////// Additional warnings for developers
+// /////// Additional warnings for developers
 //
 // The following error types are considered programmer errors, which should be
 // reported (possibly redundantly) so as to let programmers fix their code.
 const ERRORS_TO_REPORT = ["EvalError", "RangeError", "ReferenceError", "TypeError"];
 
-////////////////////////////////////////////////////////////////////////////////
-//// Promise
+// //////////////////////////////////////////////////////////////////////////////
+// // Promise
 
 /**
  * The Promise constructor. Creates a new promise given an executor callback.
  * The executor callback is called with the resolve and reject handlers.
  *
  * @param aExecutor
  *        The callback that will be called with resolve and reject.
  */
@@ -656,18 +656,18 @@ Object.freeze(Promise.Debugging);
 Object.freeze(Promise);
 
 // If module is defined, this file is loaded as a CommonJS module. Make sure
 // Promise is exported in that case.
 if (this.module) {
   module.exports = Promise;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// PromiseWalker
+// //////////////////////////////////////////////////////////////////////////////
+// // PromiseWalker
 
 /**
  * This singleton object invokes the handlers registered on resolved and
  * rejected promises, ensuring that processing is not recursive and is done in
  * the same order as registration occurred on each promise.
  *
  * There is no guarantee on the order of execution of handlers registered on
  * different promises.
@@ -816,18 +816,18 @@ this.PromiseWalker = {
       this.handlers.shift().process();
     }
   },
 };
 
 // Bind the function to the singleton once.
 PromiseWalker.walkerLoop = PromiseWalker.walkerLoop.bind(PromiseWalker);
 
-////////////////////////////////////////////////////////////////////////////////
-//// Deferred
+// //////////////////////////////////////////////////////////////////////////////
+// // Deferred
 
 /**
  * Returned by "Promise.defer" to provide a new promise along with methods to
  * change its state.
  */
 function Deferred()
 {
   this.promise = new Promise((aResolve, aReject) => {
@@ -878,18 +878,18 @@ Deferred.prototype = {
    * @note The aReason argument should not generally be a promise.  In fact,
    *       using a rejected promise for the value of aReason would make the
    *       rejection reason equal to the rejected promise itself, not to the
    *       rejection reason of the rejected promise.
    */
   reject: null,
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// Handler
+// //////////////////////////////////////////////////////////////////////////////
+// // Handler
 
 /**
  * Handler registered on a promise by the "then" function.
  */
 function Handler(aThisPromise, aOnResolve, aOnReject)
 {
   this.thisPromise = aThisPromise;
   this.onResolve = aOnResolve;
--- a/toolkit/modules/SpatialNavigation.jsm
+++ b/toolkit/modules/SpatialNavigation.jsm
@@ -64,17 +64,17 @@ function dumpNodeCoord(desc, node) {
 // modifier values
 
 const kAlt   = "alt";
 const kShift = "shift";
 const kCtrl  = "ctrl";
 const kNone  = "none";
 
 function _onInputKeyPress (event, callback) {
-  //If Spatial Navigation isn't enabled, return.
+  // If Spatial Navigation isn't enabled, return.
   if (!PrefObserver['enabled']) {
     return;
   }
 
   // Use whatever key value is available (either keyCode or charCode).
   // It might be useful for addons or whoever wants to set different
   // key to be used here (e.g. "a", "F1", "arrowUp", ...).
   var key = event.which || event.keyCode;
@@ -203,17 +203,17 @@ function _onInputKeyPress (event, callba
 
   if (bestElementToFocus === null) {
     // Couldn't find an element to focus.
     return;
   }
 
   focusManager.setFocus(bestElementToFocus, focusManager.FLAG_SHOWRING);
 
-  //if it is a text element, select all.
+  // if it is a text element, select all.
   if ((bestElementToFocus instanceof Ci.nsIDOMHTMLInputElement &&
        bestElementToFocus.mozIsTextField(false)) ||
       bestElementToFocus instanceof Ci.nsIDOMHTMLTextAreaElement) {
     bestElementToFocus.selectionStart = 0;
     bestElementToFocus.selectionEnd = bestElementToFocus.textLength;
   }
 
   if (callback != undefined) {
--- a/toolkit/modules/Task.jsm
+++ b/toolkit/modules/Task.jsm
@@ -78,18 +78,18 @@ this.EXPORTED_SYMBOLS = [
  * - The "Task.spawn" function also accepts a primitive value, or a function
  *   returning a primitive value, and treats the value as the result of the
  *   task.  This makes it possible to call an externally provided function and
  *   spawn a task from it, regardless of whether it is an asynchronous generator
  *   or a synchronous function.  This comes in handy when iterating over
  *   function lists where some items have been converted to tasks and some not.
  */
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 const Cr = Components.results;
 
 // For now, we're worried about add-ons using Tasks with CPOWs, so we'll
 // permit them in this scope, but this support will go away soon.
@@ -132,18 +132,18 @@ function* linesOf(string) {
  * @param aValue
  *        The value to identify.
  * @return A boolean indicating whether the value is a generator.
  */
 function isGenerator(aValue) {
   return Object.prototype.toString.call(aValue) == "[object Generator]";
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Task
+// //////////////////////////////////////////////////////////////////////////////
+// // Task
 
 /**
  * This object provides the public module functions.
  */
 this.Task = {
   /**
    * Creates and starts a new task.
    *
@@ -258,18 +258,18 @@ function createAsyncFunction(aTask) {
     return Promise.resolve(result);
   };
 
   asyncFunction.isAsyncFunction = true;
 
   return asyncFunction;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// TaskImpl
+// //////////////////////////////////////////////////////////////////////////////
+// // TaskImpl
 
 /**
  * Executes the specified iterator as a task, and gives access to the promise
  * that is fulfilled when the task terminates.
  */
 function TaskImpl(iterator) {
   if (gMaintainStack) {
     this._stack = (new Error()).stack;
--- a/toolkit/modules/secondscreen/RokuApp.jsm
+++ b/toolkit/modules/secondscreen/RokuApp.jsm
@@ -8,17 +8,17 @@
 this.EXPORTED_SYMBOLS = ["RokuApp"];
 
 const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/AppConstants.jsm");
 
 function log(msg) {
-  //Services.console.logStringMessage(msg);
+  // Services.console.logStringMessage(msg);
 }
 
 const PROTOCOL_VERSION = 1;
 
 /* RokuApp is a wrapper for interacting with a Roku channel.
  * The basic interactions all use a REST API.
  * spec: http://sdkdocs.roku.com/display/sdkdoc/External+Control+Guide
  */
--- a/toolkit/modules/tests/browser/browser_PromiseMessage.js
+++ b/toolkit/modules/tests/browser/browser_PromiseMessage.js
@@ -1,12 +1,12 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-/*global Cu, BrowserTestUtils, is, ok, add_task, gBrowser */
+/* global Cu, BrowserTestUtils, is, ok, add_task, gBrowser */
 "use strict";
 Cu.import("resource://gre/modules/PromiseMessage.jsm", this);
 
 
 const url = "http://example.org/tests/dom/manifest/test/resource.sjs";
 
 /**
  * Test basic API error conditions
--- a/toolkit/modules/tests/xpcshell/test_DeferredTask.js
+++ b/toolkit/modules/tests/xpcshell/test_DeferredTask.js
@@ -1,17 +1,17 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * This file tests the DeferredTask.jsm module.
  */
 
-////////////////////////////////////////////////////////////////////////////////
-/// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// / Globals
 
 var { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "DeferredTask",
                                   "resource://gre/modules/DeferredTask.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Promise",
@@ -35,18 +35,18 @@ function promiseTimeout(aTimeoutMs)
   return deferred.promise;
 }
 
 function run_test()
 {
   run_next_test();
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Tests
+// //////////////////////////////////////////////////////////////////////////////
+// // Tests
 
 /**
  * Creates a simple DeferredTask and executes it once.
  */
 add_test(function test_arm_simple()
 {
   new DeferredTask(run_next_test, 10).arm();
 });
--- a/toolkit/modules/tests/xpcshell/test_JSONFile.js
+++ b/toolkit/modules/tests/xpcshell/test_JSONFile.js
@@ -1,16 +1,16 @@
 /**
  * Tests the JSONFile object.
  */
 
 "use strict";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "DownloadPaths",
                                   "resource://gre/modules/DownloadPaths.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
@@ -62,18 +62,18 @@ const TEST_DATA = {
   number: 123,
   string: "test",
   object: {
     prop1: 1,
     prop2: 2,
   },
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// Tests
+// //////////////////////////////////////////////////////////////////////////////
+// // Tests
 
 add_task(function* test_save_reload()
 {
   let storeForSave = new JSONFile({
     path: getTempFile(TEST_STORE_FILE_NAME).path,
   });
 
   yield storeForSave.load();
--- a/toolkit/modules/tests/xpcshell/test_NewTabUtils.js
+++ b/toolkit/modules/tests/xpcshell/test_NewTabUtils.js
@@ -74,17 +74,17 @@ add_task(function* notifyLinkDelete() {
   NewTabUtils.links.removeProvider(provider);
 });
 
 add_task(function* populatePromise() {
   let count = 0;
   let expectedLinks = makeLinks(0, 10, 2);
 
   let getLinksFcn = Task.async(function* (callback) {
-    //Should not be calling getLinksFcn twice
+    // Should not be calling getLinksFcn twice
     count++;
     do_check_eq(count, 1);
     yield Promise.resolve();
     callback(expectedLinks);
   });
 
   let provider = new TestProvider(getLinksFcn);
 
--- a/toolkit/modules/tests/xpcshell/test_Promise.js
+++ b/toolkit/modules/tests/xpcshell/test_Promise.js
@@ -5,18 +5,18 @@
 Components.utils.import("resource://gre/modules/Promise.jsm");
 Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/Task.jsm");
 Components.utils.import("resource://testing-common/PromiseTestUtils.jsm");
 
 // Prevent test failures due to the unhandled rejections in this test file.
 PromiseTestUtils.disableUncaughtRejectionObserverForSelfTest();
 
-////////////////////////////////////////////////////////////////////////////////
-//// Test runner
+// //////////////////////////////////////////////////////////////////////////////
+// // Test runner
 
 var run_promise_tests = function run_promise_tests(tests, cb) {
   let loop = function loop(index) {
     if (index >= tests.length) {
       if (cb) {
         cb.call();
       }
       return;
@@ -74,18 +74,18 @@ var make_promise_test = function(test) {
     } catch (x) {
       // The test failed because of an error outside of a promise
       do_throw("Error in body of test " + test.name + ": " + x + " at " + x.stack);
       return Promise.reject();
     }
   };
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// Tests
+// //////////////////////////////////////////////////////////////////////////////
+// // Tests
 
 var tests = [];
 
 // Utility function to observe an failures in a promise
 // This function is useful if the promise itself is
 // not returned.
 var observe_failures = function observe_failures(promise) {
   promise.catch(function onReject(reason) {
--- a/toolkit/modules/tests/xpcshell/test_PromiseUtils.js
+++ b/toolkit/modules/tests/xpcshell/test_PromiseUtils.js
@@ -7,19 +7,19 @@ Components.utils.import("resource://gre/
 Components.utils.import("resource://gre/modules/Timer.jsm");
 Components.utils.import("resource://testing-common/PromiseTestUtils.jsm");
 
 // Tests for PromiseUtils.jsm
 function run_test() {
   run_next_test();
 }
 
-///////////////////////////////////////////////////////////////////////////////////////
+// /////////////////////////////////////////////////////////////////////////////////////
 // Tests for PromiseUtils.defer()
-///////////////////////////////////////////////////////////////////////////////////////
+// /////////////////////////////////////////////////////////////////////////////////////
 
 /* Tests for checking the resolve method of the Deferred object
  * returned by PromiseUtils.defer() */
 add_task(function* test_resolve_string() {
   let def = PromiseUtils.defer();
   let expected = "The promise is resolved " + Math.random();
   def.resolve(expected);
   let result = yield def.promise;
--- a/toolkit/modules/tests/xpcshell/test_Services.js
+++ b/toolkit/modules/tests/xpcshell/test_Services.js
@@ -1,34 +1,34 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * This file tests the Services.jsm module.
  */
 
-////////////////////////////////////////////////////////////////////////////////
-/// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// / Globals
 
 var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
 var Cr = Components.results;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
 function checkService(service, interface) {
   do_print("Checking that Services." + service + " is an " + interface);
   do_check_true(service in Services);
   do_check_true(Services[service] instanceof interface);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-/// Tests
+// //////////////////////////////////////////////////////////////////////////////
+// / Tests
 
 function run_test()
 {
   do_get_profile();
 
   checkService("appShell", Ci.nsIAppShellService);
   checkService("appinfo", Ci.nsIXULRuntime);
   checkService("blocklist", Ci.nsIBlocklistService);
--- a/toolkit/modules/tests/xpcshell/test_web_channel_broker.js
+++ b/toolkit/modules/tests/xpcshell/test_web_channel_broker.js
@@ -15,18 +15,18 @@ const VALID_WEB_CHANNEL_ORIGIN = Service
 function run_test() {
   run_next_test();
 }
 
 /**
  * Test WebChannelBroker channel map
  */
 add_test(function test_web_channel_broker_channel_map() {
-  let channel = new Object();
-  let channel2 = new Object();
+  let channel = {};
+  let channel2 = {};
 
   do_check_eq(WebChannelBroker._channelMap.size, 0);
   do_check_false(WebChannelBroker._messageListenerAttached);
 
   // make sure _channelMap works correctly
   WebChannelBroker.registerChannel(channel);
   do_check_eq(WebChannelBroker._channelMap.size, 1);
   do_check_true(WebChannelBroker._messageListenerAttached);
@@ -48,29 +48,29 @@ add_test(function test_web_channel_broke
 });
 
 
 /**
  * Test WebChannelBroker _listener test
  */
 add_task(function test_web_channel_broker_listener() {
   return new Promise((resolve, reject) => {
-    var channel = new Object({
+    var channel = {
       id: VALID_WEB_CHANNEL_ID,
       _originCheckCallback: requestPrincipal => {
         return VALID_WEB_CHANNEL_ORIGIN.prePath === requestPrincipal.origin;
       },
       deliver: function(data, sender) {
         do_check_eq(data.id, VALID_WEB_CHANNEL_ID);
         do_check_eq(data.message.command, "hello");
         do_check_neq(sender, undefined);
         WebChannelBroker.unregisterChannel(channel);
         resolve();
       }
-    });
+    };
 
     WebChannelBroker.registerChannel(channel);
 
     var mockEvent = {
       data: {
         id: VALID_WEB_CHANNEL_ID,
         message: {
           command: "hello"
--- a/toolkit/mozapps/downloads/DownloadTaskbarProgress.jsm
+++ b/toolkit/mozapps/downloads/DownloadTaskbarProgress.jsm
@@ -3,34 +3,34 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 this.EXPORTED_SYMBOLS = [
   "DownloadTaskbarProgress",
 ];
 
-////////////////////////////////////////////////////////////////////////////////
-//// Constants
+// //////////////////////////////////////////////////////////////////////////////
+// // Constants
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 const Cr = Components.results;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/AppConstants.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Services",
                                   "resource://gre/modules/Services.jsm");
 
 const kTaskbarIDWin = "@mozilla.org/windows-taskbar;1";
 const kTaskbarIDMac = "@mozilla.org/widget/macdocksupport;1";
 
-////////////////////////////////////////////////////////////////////////////////
-//// DownloadTaskbarProgress Object
+// //////////////////////////////////////////////////////////////////////////////
+// // DownloadTaskbarProgress Object
 
 this.DownloadTaskbarProgress =
 {
   init: function DTP_init()
   {
     if (DownloadTaskbarProgressUpdater) {
       DownloadTaskbarProgressUpdater._init();
     }
@@ -89,28 +89,28 @@ this.DownloadTaskbarProgress =
     if (!DownloadTaskbarProgressUpdater) {
       return null;
     }
     return DownloadTaskbarProgressUpdater._taskbarState;
   },
 
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// DownloadTaskbarProgressUpdater Object
+// //////////////////////////////////////////////////////////////////////////////
+// // DownloadTaskbarProgressUpdater Object
 
 var DownloadTaskbarProgressUpdater =
 {
-  /// Whether the taskbar is initialized.
+  // / Whether the taskbar is initialized.
   _initialized: false,
 
-  /// Reference to the taskbar.
+  // / Reference to the taskbar.
   _taskbar: null,
 
-  /// Reference to the download manager.
+  // / Reference to the download manager.
   _dm: null,
 
   /**
    * Initialize and register ourselves as a download progress listener.
    */
   _init: function DTPU_init()
   {
     if (this._initialized) {
@@ -160,17 +160,17 @@ var DownloadTaskbarProgressUpdater =
 
   /**
    * This holds a reference to the taskbar progress for the window we're
    * working with. This window would preferably be download window, but can be
    * another window if it isn't open.
    */
   _activeTaskbarProgress: null,
 
-  /// Whether the active window is the download window
+  // / Whether the active window is the download window
   _activeWindowIsDownloadWindow: false,
 
   /**
    * Sets the active window, and whether it's the download window. This takes
    * care of clearing out the previous active window's taskbar item, updating
    * the taskbar, and setting an onunload listener.
    *
    * @param aWindow
@@ -204,17 +204,17 @@ var DownloadTaskbarProgressUpdater =
         }, false);
       }
       else {
         this._activeTaskbarProgress = null;
       }
     }
   },
 
-  /// Current state displayed on the active window's taskbar item
+  // / Current state displayed on the active window's taskbar item
   _taskbarState: null,
   _totalSize: 0,
   _totalTransferred: 0,
 
   _shouldSetState: function DTPU_shouldSetState()
   {
     if (AppConstants.platform == "win") {
       // If the active window is not the download manager window, set the state
@@ -365,18 +365,18 @@ var DownloadTaskbarProgressUpdater =
       }
 
       // We aren't ever going to reach this point while the download manager is
       // open, so it's safe to assume false for the second operand
       this._setActiveWindow(newActiveWindow, false);
     }
   },
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsIDownloadProgressListener
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsIDownloadProgressListener
 
   /**
    * Update status if a download's progress has changed.
    */
   onProgressChange: function DTPU_onProgressChange()
   {
     this._updateStatus();
     this._updateTaskbar();
--- a/toolkit/mozapps/downloads/content/DownloadProgressListener.js
+++ b/toolkit/mozapps/downloads/content/DownloadProgressListener.js
@@ -9,23 +9,23 @@
  * in the Download Manager UI such as displaying amount transferred, transfer
  * rate, and time left for each download.
  *
  * This class implements the nsIDownloadProgressListener interface.
  */
 function DownloadProgressListener() {}
 
 DownloadProgressListener.prototype = {
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsISupports
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsISupports
 
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIDownloadProgressListener]),
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsIDownloadProgressListener
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsIDownloadProgressListener
 
   onDownloadStateChange: function dlPL_onDownloadStateChange(aState, aDownload)
   {
     // Update window title in-case we don't get all progress notifications
     onUpdateProgress();
 
     let dl;
     let state = aDownload.state;
--- a/toolkit/mozapps/downloads/content/downloads.js
+++ b/toolkit/mozapps/downloads/content/downloads.js
@@ -1,16 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
+// //////////////////////////////////////////////////////////////////////////////
+// // Globals
 
 const PREF_BDM_CLOSEWHENDONE = "browser.download.manager.closeWhenDone";
 const PREF_BDM_ALERTONEXEOPEN = "browser.download.manager.alertOnEXEOpen";
 const PREF_BDM_SCANWHENDONE = "browser.download.manager.scanWhenDone";
 
 const nsLocalFile = Components.Constructor("@mozilla.org/file/local;1",
                                            "nsILocalFile", "initWithPath");
 
@@ -80,18 +80,18 @@ var gStr = {
   downloadsTitlePercent: "downloadsTitlePercent",
   fileExecutableSecurityWarningTitle: "fileExecutableSecurityWarningTitle",
   fileExecutableSecurityWarningDontAsk: "fileExecutableSecurityWarningDontAsk"
 };
 
 // The statement to query for downloads that are active or match the search
 var gStmt = null;
 
-////////////////////////////////////////////////////////////////////////////////
-//// Start/Stop Observers
+// //////////////////////////////////////////////////////////////////////////////
+// // Start/Stop Observers
 
 function downloadCompleted(aDownload)
 {
   // The download is changing state, so update the clear list button
   updateClearListButton();
 
   // Wrap this in try...catch since this can be called while shutting down...
   // it doesn't really matter if it fails then since well.. we're shutting down
@@ -168,18 +168,18 @@ function autoRemoveAndClose(aDownload)
 
 // This function can be overwritten by extensions that wish to place the
 // Download Window in another part of the UI.
 function gCloseDownloadManager()
 {
   window.close();
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Download Event Handlers
+// //////////////////////////////////////////////////////////////////////////////
+// // Download Event Handlers
 
 function cancelDownload(aDownload)
 {
   gDownloadManager.cancelDownload(aDownload.getAttribute("dlid"));
 
   // XXXben -
   // If we got here because we resumed the download, we weren't using a temp file
   // because we used saveURL instead. (this is because the proper download mechanism
@@ -399,18 +399,18 @@ function onUpdateProgress()
     title = PluralForm.get(numActiveDownloads, title);
     title = replaceInsert(title, 1, numActiveDownloads);
     title = replaceInsert(title, 2, mean);
 
     document.title = title;
   }
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Startup, Shutdown
+// //////////////////////////////////////////////////////////////////////////////
+// // Startup, Shutdown
 
 function Startup()
 {
   gDownloadsView = document.getElementById("downloadView");
   gSearchBox = document.getElementById("searchbox");
 
   // convert strings to those in the string bundle
   let sb = document.getElementById("downloadStrings");
@@ -490,18 +490,18 @@ var gDownloadObserver = {
             gDownloadManager.activeDownloadCount == 0) {
           setTimeout(gCloseDownloadManager, 0);
         }
         break;
     }
   }
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// View Context Menus
+// //////////////////////////////////////////////////////////////////////////////
+// // View Context Menus
 
 var gContextMenus = [
   // DOWNLOAD_DOWNLOADING
   [
     "menuitem_pause"
     , "menuitem_cancel"
     , "menuseparator"
     , "menuitem_show"
@@ -631,18 +631,18 @@ function buildContextMenu(aEvent)
       popup.appendChild(menuitem);
     }
 
     return true;
   }
 
   return false;
 }
-////////////////////////////////////////////////////////////////////////////////
-//// Drag and Drop
+// //////////////////////////////////////////////////////////////////////////////
+// // Drag and Drop
 var gDownloadDNDObserver =
 {
   onDragStart: function (aEvent)
   {
     if (!gDownloadsView.selectedItem)
       return;
     var dl = gDownloadsView.selectedItem;
     var f = getLocalFileFromNativePathOrUrl(dl.getAttribute("file"));
@@ -707,18 +707,18 @@ function pasteHandler() {
       return;
 
     let uri = Services.io.newURI(url, null, null);
 
     saveURL(uri.spec, name || uri.spec, null, true, true, null, document);
   } catch (ex) {}
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Command Updating and Command Handlers
+// //////////////////////////////////////////////////////////////////////////////
+// // Command Updating and Command Handlers
 
 var gDownloadViewController = {
   isCommandEnabled: function(aCommand, aItem)
   {
     let dl = aItem;
     let download = null; // used for getting an nsIDownload object
 
     switch (aCommand) {
@@ -854,18 +854,18 @@ function openExternal(aFile)
 
   var protocolSvc = Cc["@mozilla.org/uriloader/external-protocol-service;1"].
                     getService(Ci.nsIExternalProtocolService);
   protocolSvc.loadUrl(uri);
 
   return;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-//// Utility Functions
+// //////////////////////////////////////////////////////////////////////////////
+// // Utility Functions
 
 /**
  * Create a download richlistitem with the provided attributes. Some attributes
  * are *required* while optional ones will only be set on the item if provided.
  *
  * @param aAttrs
  *        An object that must have the following properties: dlid, file,
  *        target, uri, state, progress, startTime, endTime, currBytes,
--- a/toolkit/mozapps/downloads/content/helperApps.js
+++ b/toolkit/mozapps/downloads/content/helperApps.js
@@ -15,17 +15,17 @@ const CLASS_PROTOCOLINFO    = "scheme";
 // namespace prefix
 const NC_NS                 = "http://home.netscape.com/NC-rdf#";
 
 // type list properties
 
 const NC_MIME_TYPES         = NC_NS + "MIME-types";
 const NC_PROTOCOL_SCHEMES   = NC_NS + "Protocol-Schemes";
 
-///////////////////////////////////////////////////////////////////////////////
+// /////////////////////////////////////////////////////////////////////////////
 // MIME Types DataSource Wrapper
 
 function NC_URI(aProperty)
 {
   return "http://home.netscape.com/NC-rdf#" + aProperty;
 }
 
 function MIME_URI(aType)
--- a/toolkit/mozapps/extensions/DeferredSave.jsm
+++ b/toolkit/mozapps/extensions/DeferredSave.jsm
@@ -4,48 +4,48 @@
 
 "use strict";
 
 const Cu = Components.utils;
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 
 Cu.import("resource://gre/modules/osfile.jsm");
-/*globals OS*/
+/* globals OS*/
 Cu.import("resource://gre/modules/Promise.jsm");
 
 // Make it possible to mock out timers for testing
 var MakeTimer = () => Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
 
 this.EXPORTED_SYMBOLS = ["DeferredSave"];
 
 // If delay parameter is not provided, default is 50 milliseconds.
 const DEFAULT_SAVE_DELAY_MS = 50;
 
 Cu.import("resource://gre/modules/Log.jsm");
-//Configure a logger at the parent 'DeferredSave' level to format
-//messages for all the modules under DeferredSave.*
+// Configure a logger at the parent 'DeferredSave' level to format
+// messages for all the modules under DeferredSave.*
 const DEFERREDSAVE_PARENT_LOGGER_ID = "DeferredSave";
 var parentLogger = Log.repository.getLogger(DEFERREDSAVE_PARENT_LOGGER_ID);
 parentLogger.level = Log.Level.Warn;
 var formatter = new Log.BasicFormatter();
-//Set parent logger (and its children) to append to
-//the Javascript section of the Browser Console
+// Set parent logger (and its children) to append to
+// the Javascript section of the Browser Console
 parentLogger.addAppender(new Log.ConsoleAppender(formatter));
-//Set parent logger (and its children) to
-//also append to standard out
+// Set parent logger (and its children) to
+// also append to standard out
 parentLogger.addAppender(new Log.DumpAppender(formatter));
 
-//Provide the ability to enable/disable logging
-//messages at runtime.
-//If the "extensions.logging.enabled" preference is
-//missing or 'false', messages at the WARNING and higher
-//severity should be logged to the JS console and standard error.
-//If "extensions.logging.enabled" is set to 'true', messages
-//at DEBUG and higher should go to JS console and standard error.
+// Provide the ability to enable/disable logging
+// messages at runtime.
+// If the "extensions.logging.enabled" preference is
+// missing or 'false', messages at the WARNING and higher
+// severity should be logged to the JS console and standard error.
+// If "extensions.logging.enabled" is set to 'true', messages
+// at DEBUG and higher should go to JS console and standard error.
 Cu.import("resource://gre/modules/Services.jsm");
 
 const PREF_LOGGING_ENABLED = "extensions.logging.enabled";
 const NS_PREFBRANCH_PREFCHANGE_TOPIC_ID = "nsPref:changed";
 
 /**
 * Preference listener which listens for a change in the
 * "extensions.logging.enabled" preference and changes the logging level of the
--- a/toolkit/mozapps/extensions/LightweightThemeManager.jsm
+++ b/toolkit/mozapps/extensions/LightweightThemeManager.jsm
@@ -6,17 +6,17 @@
 
 this.EXPORTED_SYMBOLS = ["LightweightThemeManager"];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 Components.utils.import("resource://gre/modules/AddonManager.jsm");
-/*globals AddonManagerPrivate*/
+/* globals AddonManagerPrivate*/
 Components.utils.import("resource://gre/modules/Services.jsm");
 
 const ID_SUFFIX              = "@personas.mozilla.org";
 const PREF_LWTHEME_TO_SELECT = "extensions.lwThemeToSelect";
 const PREF_GENERAL_SKINS_SELECTEDSKIN = "general.skins.selectedSkin";
 const PREF_EM_DSS_ENABLED    = "extensions.dss.enabled";
 const ADDON_TYPE             = "theme";
 
--- a/toolkit/mozapps/extensions/addonManager.js
+++ b/toolkit/mozapps/extensions/addonManager.js
@@ -35,17 +35,17 @@ const CHILD_SCRIPT = "resource://gre/mod
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
 var gSingleton = null;
 
 function amManager() {
   Cu.import("resource://gre/modules/AddonManager.jsm");
-  /*globals AddonManagerPrivate*/
+  /* globals AddonManagerPrivate*/
 
   Services.mm.loadFrameScript(CHILD_SCRIPT, true);
   Services.mm.addMessageListener(MSG_INSTALL_ENABLED, this);
   Services.mm.addMessageListener(MSG_INSTALL_ADDONS, this);
   Services.mm.addMessageListener(MSG_PROMISE_REQUEST, this);
   Services.mm.addMessageListener(MSG_INSTALL_CLEANUP, this);
   Services.mm.addMessageListener(MSG_ADDON_EVENT_REQ, this);
 
--- a/toolkit/mozapps/extensions/content/extensions.js
+++ b/toolkit/mozapps/extensions/content/extensions.js
@@ -1,16 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
 /* import-globals-from ../../../content/contentAreaUtils.js */
-/*globals XMLStylesheetProcessingInstruction*/
+/* globals XMLStylesheetProcessingInstruction*/
 
 var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
 var Cr = Components.results;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
--- a/toolkit/mozapps/extensions/content/extensions.xml
+++ b/toolkit/mozapps/extensions/content/extensions.xml
@@ -1090,18 +1090,18 @@
         ]]></setter>
       </property>
 
       <property name="includeUpdate">
         <getter><![CDATA[
           return this._includeUpdate.checked && !!this.mManualUpdate;
         ]]></getter>
         <setter><![CDATA[
-          //XXXunf Eventually, we'll want to persist this for individual
-          //       updates - see bug 594619.
+          // XXXunf Eventually, we'll want to persist this for individual
+          //        updates - see bug 594619.
           this._includeUpdate.checked = !!val;
         ]]></setter>
       </property>
 
       <method name="_initWithAddon">
         <parameter name="aAddon"/>
         <body><![CDATA[
           this.mAddon = aAddon;
--- a/toolkit/mozapps/extensions/content/update.js
+++ b/toolkit/mozapps/extensions/content/update.js
@@ -101,17 +101,17 @@ var gUpdateWizard = {
                              aNextButton, aNextButtonIsDisabled,
                              aCancelButton, aCancelButtonIsDisabled)
   {
     this._setUpButton("back", aBackButton, aBackButtonIsDisabled);
     this._setUpButton("next", aNextButton, aNextButtonIsDisabled);
     this._setUpButton("cancel", aCancelButton, aCancelButtonIsDisabled);
   },
 
-  /////////////////////////////////////////////////////////////////////////////
+  // ///////////////////////////////////////////////////////////////////////////
   // Update Errors
   errorItems: [],
 
   checkForErrors: function(aElementIDToShow)
   {
     if (this.errorItems.length > 0)
       document.getElementById(aElementIDToShow).hidden = false;
   },
@@ -267,23 +267,23 @@ var gVersionInfoPage = {
         return;
       }
       document.documentElement.currentPage = document.getElementById("mismatch");
     }
     else {
       logger.info("VersionInfo: No updates require further action");
       // VersionInfo compatibility updates resolved all compatibility problems,
       // close this window and continue starting the application...
-      //XXX Bug 314754 - We need to use setTimeout to close the window due to
+      // XXX Bug 314754 - We need to use setTimeout to close the window due to
       // the EM using xmlHttpRequest when checking for updates.
       setTimeout(close, 0);
     }
   },
 
-  /////////////////////////////////////////////////////////////////////////////
+  // ///////////////////////////////////////////////////////////////////////////
   // UpdateListener
   onUpdateFinished: function(aAddon, status) {
     ++this._completeCount;
 
     if (status != AddonManager.UPDATE_STATUS_NO_ERROR) {
       logger.debug("VersionInfo update " + this._completeCount + " of " + this._totalCount +
            " failed for " + aAddon.id + ": " + status);
       gUpdateWizard.errorItems.push(aAddon);
@@ -372,17 +372,17 @@ var gUpdatePage = {
       return;
 
     var nextPage = document.getElementById("noupdates");
     if (gUpdateWizard.addonsToUpdate.length > 0)
       nextPage = document.getElementById("found");
     document.documentElement.currentPage = nextPage;
   },
 
-  /////////////////////////////////////////////////////////////////////////////
+  // ///////////////////////////////////////////////////////////////////////////
   // UpdateListener
   onUpdateAvailable: function(aAddon, aInstall) {
     logger.debug("UpdatePage got an update for " + aAddon.id + ": " + aAddon.version);
     gUpdateWizard.addonsToUpdate.push(aInstall);
   },
 
   onUpdateFinished: function(aAddon, status) {
     if (status != AddonManager.UPDATE_STATUS_NO_ERROR)
@@ -546,17 +546,17 @@ var gInstallingPage = {
       install.cancel();
       this.startNextInstall();
       return;
     }
     install.addListener(this);
     install.install();
   },
 
-  /////////////////////////////////////////////////////////////////////////////
+  // ///////////////////////////////////////////////////////////////////////////
   // InstallListener
   onDownloadStarted: function(aInstall) {
     if (gUpdateWizard.shuttingDown) {
       return;
     }
     var strings = document.getElementById("updateStrings");
     var label = strings.getFormattedString("downloadingPrefix", [aInstall.name]);
     var actionItem = document.getElementById("actionItem");
--- a/toolkit/mozapps/extensions/internal/AddonRepository.jsm
+++ b/toolkit/mozapps/extensions/internal/AddonRepository.jsm
@@ -6,17 +6,17 @@
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 const Cr = Components.results;
 
 Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/AddonManager.jsm");
-/*globals AddonManagerPrivate*/
+/* globals AddonManagerPrivate*/
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
                                   "resource://gre/modules/NetUtil.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "OS",
                                   "resource://gre/modules/osfile.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "DeferredSave",
                                   "resource://gre/modules/DeferredSave.jsm");
--- a/toolkit/mozapps/extensions/internal/AddonRepository_SQLiteMigrator.jsm
+++ b/toolkit/mozapps/extensions/internal/AddonRepository_SQLiteMigrator.jsm
@@ -5,17 +5,17 @@
 "use strict";
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/AddonManager.jsm");
-/*globals AddonManagerPrivate*/
+/* globals AddonManagerPrivate*/
 Cu.import("resource://gre/modules/FileUtils.jsm");
 
 const KEY_PROFILEDIR  = "ProfD";
 const FILE_DATABASE   = "addons.sqlite";
 const LAST_DB_SCHEMA   = 4;
 
 // Add-on properties present in the columns of the database
 const PROP_SINGLE = ["id", "type", "name", "version", "creator", "description",
--- a/toolkit/mozapps/extensions/internal/Content.js
+++ b/toolkit/mozapps/extensions/internal/Content.js
@@ -1,13 +1,13 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/*globals addMessageListener*/
+/* globals addMessageListener*/
 
 "use strict";
 
 (function() {
 
 var {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 
 var {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
--- a/toolkit/mozapps/extensions/internal/GMPProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/GMPProvider.jsm
@@ -7,25 +7,25 @@
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 
 this.EXPORTED_SYMBOLS = [];
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/AddonManager.jsm");
-/*globals AddonManagerPrivate*/
+/* globals AddonManagerPrivate*/
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://gre/modules/osfile.jsm");
-/*globals OS*/
+/* globals OS*/
 Cu.import("resource://gre/modules/Log.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
 Cu.import("resource://gre/modules/GMPUtils.jsm");
-/*globals EME_ADOBE_ID, GMP_PLUGIN_IDS, GMPPrefs, GMPUtils, OPEN_H264_ID, WIDEVINE_ID */
+/* globals EME_ADOBE_ID, GMP_PLUGIN_IDS, GMPPrefs, GMPUtils, OPEN_H264_ID, WIDEVINE_ID */
 Cu.import("resource://gre/modules/AppConstants.jsm");
 Cu.import("resource://gre/modules/UpdateUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(
   this, "GMPInstallManager", "resource://gre/modules/GMPInstallManager.jsm");
 XPCOMUtils.defineLazyModuleGetter(
   this, "setTimeout", "resource://gre/modules/Timer.jsm");
 
--- a/toolkit/mozapps/extensions/internal/PluginProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/PluginProvider.jsm
@@ -6,17 +6,17 @@
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 
 this.EXPORTED_SYMBOLS = [];
 
 Cu.import("resource://gre/modules/AddonManager.jsm");
-/*globals AddonManagerPrivate*/
+/* globals AddonManagerPrivate*/
 Cu.import("resource://gre/modules/Services.jsm");
 
 const URI_EXTENSION_STRINGS  = "chrome://mozapps/locale/extensions/extensions.properties";
 const STRING_TYPE_NAME       = "type.%ID%.name";
 const LIST_UPDATED_TOPIC     = "plugins-list-updated";
 const FLASH_MIME_TYPE        = "application/x-shockwave-flash";
 
 Cu.import("resource://gre/modules/Log.jsm");
--- a/toolkit/mozapps/extensions/internal/ProductAddonChecker.jsm
+++ b/toolkit/mozapps/extensions/internal/ProductAddonChecker.jsm
@@ -21,26 +21,26 @@ this.EXPORTED_SYMBOLS = [ "ProductAddonC
 
 Cu.importGlobalProperties(["XMLHttpRequest"]);
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
 Cu.import("resource://gre/modules/Log.jsm");
 Cu.import("resource://gre/modules/CertUtils.jsm");
-/*globals checkCert, BadCertHandler*/
+/* globals checkCert, BadCertHandler*/
 Cu.import("resource://gre/modules/FileUtils.jsm");
 Cu.import("resource://gre/modules/NetUtil.jsm");
 Cu.import("resource://gre/modules/osfile.jsm");
 
-/*globals GMPPrefs */
+/* globals GMPPrefs */
 XPCOMUtils.defineLazyModuleGetter(this, "GMPPrefs",
                                   "resource://gre/modules/GMPUtils.jsm");
 
-/*globals OS */
+/* globals OS */
 
 XPCOMUtils.defineLazyModuleGetter(this, "UpdateUtils",
                                   "resource://gre/modules/UpdateUtils.jsm");
 
 var logger = Log.repository.getLogger("addons.productaddons");
 
 // This exists so that tests can override the XHR behaviour for downloading
 // the addon update XML file.
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -13,17 +13,17 @@ this.EXPORTED_SYMBOLS = ["XPIProvider"];
 
 const CONSTANTS = {};
 Cu.import("resource://gre/modules/addons/AddonConstants.jsm", CONSTANTS);
 const { ADDON_SIGNING, REQUIRE_SIGNING } = CONSTANTS
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/AddonManager.jsm");
-/*globals AddonManagerPrivate*/
+/* globals AddonManagerPrivate*/
 Cu.import("resource://gre/modules/Preferences.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "AddonRepository",
                                   "resource://gre/modules/addons/AddonRepository.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "ChromeManifestParser",
                                   "resource://gre/modules/ChromeManifestParser.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "LightweightThemeManager",
                                   "resource://gre/modules/LightweightThemeManager.jsm");
@@ -301,17 +301,17 @@ var gIDTest = /^(\{[0-9a-f]{8}-[0-9a-f]{
 Cu.import("resource://gre/modules/Log.jsm");
 const LOGGER_ID = "addons.xpi";
 
 // Create a new logger for use by all objects in this Addons XPI Provider module
 // (Requires AddonManager.jsm)
 var logger = Log.repository.getLogger(LOGGER_ID);
 
 const LAZY_OBJECTS = ["XPIDatabase", "XPIDatabaseReconcile"];
-/*globals XPIDatabase, XPIDatabaseReconcile*/
+/* globals XPIDatabase, XPIDatabaseReconcile*/
 
 var gLazyObjectsLoaded = false;
 
 function loadLazyObjects() {
   let uri = "resource://gre/modules/addons/XPIProviderUtils.js";
   let scope = Cu.Sandbox(Services.scriptSecurityManager.getSystemPrincipal(), {
     sandboxName: uri,
     wantGlobalProperties: ["TextDecoder"],
--- a/toolkit/mozapps/extensions/internal/XPIProviderUtils.js
+++ b/toolkit/mozapps/extensions/internal/XPIProviderUtils.js
@@ -1,29 +1,29 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
 // These are injected from XPIProvider.jsm
-/*globals ADDON_SIGNING, SIGNED_TYPES, BOOTSTRAP_REASONS, DB_SCHEMA,
+/* globals ADDON_SIGNING, SIGNED_TYPES, BOOTSTRAP_REASONS, DB_SCHEMA,
           AddonInternal, XPIProvider, XPIStates, syncLoadManifestFromFile,
           isUsableAddon, recordAddonTelemetry, applyBlocklistChanges,
           flushChromeCaches, canRunInSafeMode*/
 
 var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cr = Components.results;
 var Cu = Components.utils;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/AddonManager.jsm");
-/*globals AddonManagerPrivate*/
+/* globals AddonManagerPrivate*/
 Cu.import("resource://gre/modules/Preferences.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "AddonRepository",
                                   "resource://gre/modules/addons/AddonRepository.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
                                   "resource://gre/modules/FileUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "DeferredSave",
                                   "resource://gre/modules/DeferredSave.jsm");
--- a/toolkit/mozapps/extensions/nsBlocklistService.js
+++ b/toolkit/mozapps/extensions/nsBlocklistService.js
@@ -14,17 +14,17 @@ Components.utils.import("resource://gre/
 Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/AppConstants.jsm");
 
 try {
   // AddonManager.jsm doesn't allow itself to be imported in the child
   // process. We're used in the child process (for now), so guard against
   // this.
   Components.utils.import("resource://gre/modules/AddonManager.jsm");
-  /*globals AddonManagerPrivate*/
+  /* globals AddonManagerPrivate*/
 } catch (e) {
 }
 
 XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
                                   "resource://gre/modules/FileUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "UpdateUtils",
                                   "resource://gre/modules/UpdateUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "OS",
--- a/toolkit/mozapps/extensions/test/browser/discovery_install.html
+++ b/toolkit/mozapps/extensions/test/browser/discovery_install.html
@@ -1,12 +1,12 @@
 <html>
 <head>
 <script type="text/javascript">
-/*globals InstallTrigger*/
+/* globals InstallTrigger */
 function install() {
   InstallTrigger.install({
     "Test Add-on": {
       URL: "https://example.com/browser/toolkit/mozapps/extensions/test/xpinstall/amosigned.xpi"
     }
   });
 }
 </script>
--- a/toolkit/mozapps/extensions/test/browser/head.js
+++ b/toolkit/mozapps/extensions/test/browser/head.js
@@ -1,12 +1,12 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
-/*globals end_test*/
+/* globals end_test*/
 
 Components.utils.import("resource://gre/modules/NetUtil.jsm");
 
 var tmp = {};
 Components.utils.import("resource://gre/modules/AddonManager.jsm", tmp);
 Components.utils.import("resource://gre/modules/Log.jsm", tmp);
 var AddonManager = tmp.AddonManager;
 var AddonManagerPrivate = tmp.AddonManagerPrivate;
@@ -679,17 +679,17 @@ function addCertOverride(host, bits) {
     req.channel.notificationCallbacks = new CertOverrideListener(host, bits);
     req.send(null);
   }
   catch (e) {
     // This request will fail since the SSL server is not trusted yet
   }
 }
 
-/***** Mock Provider *****/
+/** *** Mock Provider *****/
 
 function MockProvider(aUseAsyncCallbacks, aTypes) {
   this.addons = [];
   this.installs = [];
   this.callbackTimers = [];
   this.timerLocations = new Map();
   this.useAsyncCallbacks = (aUseAsyncCallbacks === undefined) ? true : aUseAsyncCallbacks;
   this.types = (aTypes === undefined) ? [{
@@ -714,17 +714,17 @@ MockProvider.prototype = {
   installs: null,
   started: null,
   apiDelay: 10,
   callbackTimers: null,
   timerLocations: null,
   useAsyncCallbacks: null,
   types: null,
 
-  /***** Utility functions *****/
+  /** *** Utility functions *****/
 
   /**
    * Register this provider with the AddonManager
    */
   register: function MP_register() {
     info("Registering mock add-on provider");
     AddonManagerPrivate.registerProvider(this, this.types);
   },
@@ -877,17 +877,17 @@ MockProvider.prototype = {
       }
       this.addInstall(install);
       newInstalls.push(install);
     }
 
     return newInstalls;
   },
 
-  /***** AddonProvider implementation *****/
+  /** *** AddonProvider implementation *****/
 
   /**
    * Called to initialize the provider.
    */
   startup: function MP_startup() {
     this.started = true;
   },
 
@@ -1077,17 +1077,17 @@ MockProvider.prototype = {
    *         The URI being installed from
    * @return true if installing is allowed
    */
   isInstallAllowed: function MP_isInstallAllowed(aUri) {
     return false;
   },
 
 
-  /***** Internal functions *****/
+  /** *** Internal functions *****/
 
   /**
    * Delay calling a callback to fake a time-consuming async operation.
    * The delay is specified by the apiDelay property, in milliseconds.
    * Parameters to send to the callback should be specified as arguments after
    * the aCallback argument.
    *
    * @param aCallback Callback to eventually call
@@ -1113,17 +1113,17 @@ MockProvider.prototype = {
         this.callbackTimers.splice(idx, 1);
       }
       this.timerLocations.delete(timer);
       aCallback(...aArgs);
     }, this.apiDelay, timer.TYPE_ONE_SHOT);
   }
 };
 
-/***** Mock Addon object for the Mock Provider *****/
+/** *** Mock Addon object for the Mock Provider *****/
 
 function MockAddon(aId, aName, aType, aOperationsRequiringRestart) {
   // Only set required attributes.
   this.id = aId || "";
   this.name = aName || "";
   this.type = aType || "extension";
   this.version = "";
   this.isCompatible = true;
@@ -1284,17 +1284,17 @@ MockAddon.prototype = {
         this.isActive = newActive;
         this.pendingOperations -= AddonManager.PENDING_DISABLE;
         AddonManagerPrivate.callAddonListeners("onDisabled", this);
       }
     }
   }
 };
 
-/***** Mock AddonInstall object for the Mock Provider *****/
+/** *** Mock AddonInstall object for the Mock Provider *****/
 
 function MockInstall(aName, aType, aAddonToInstall) {
   this.name = aName || "";
   // Don't expose type until download completed
   this._type = aType || "extension";
   this.type = null;
   this.version = "1.0";
   this.iconURL = "";
--- a/toolkit/mozapps/extensions/test/mochitest/test_bug887098.html
+++ b/toolkit/mozapps/extensions/test/mochitest/test_bug887098.html
@@ -23,17 +23,17 @@ https://bugzilla.mozilla.org/show_bug.cg
       // about: is privileged, so we need to be privileged to load it.
       SpecialPowers.wrap(iwin).location.href = 'about:';
     } else {
       is(href, 'about:', "Successfully navigated to about:");
       try {
         evalRef('InstallTrigger.install({URL: "chrome://global/skin/global.css"});');
         ok(false, "Should have thrown when trying to install restricted URI from InstallTrigger");
       } catch (e) {
-        //XXXgijs this test broke because of the switch to webidl. I'm told
+        // XXXgijs this test broke because of the switch to webidl. I'm told
         // it has to do with compartments and the fact that we eval in "about:".
         // Tracking in bug 1007671
         todo(/permission/.test(e), "We should throw a security exception. Got: " + e);
       }
       SimpleTest.finish();
     }
   }
 
--- a/toolkit/mozapps/extensions/test/xpcshell/head_unpack.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/head_unpack.js
@@ -1,3 +1,3 @@
-/*globals Services, TEST_UNPACKED: true*/
+/* globals Services, TEST_UNPACKED: true*/
 Services.prefs.setBoolPref("extensions.alwaysUnpack", true);
 TEST_UNPACKED = true;
--- a/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_metadata_filters.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_metadata_filters.js
@@ -30,17 +30,17 @@ var WindowWatcher = {
 
     // Simulate auto-disabling any softblocks
     var list = args.wrappedJSObject.list;
     list.forEach(function(aItem) {
       if (!aItem.blocked)
         aItem.disable = true;
     });
 
-    //run the code after the blocklist is closed
+    // run the code after the blocklist is closed
     Services.obs.notifyObservers(null, "addon-blocklist-closed", null);
 
   },
 
   QueryInterface: function(iid) {
     if (iid.equals(Ci.nsIWindowWatcher)
      || iid.equals(Ci.nsISupports))
       return this;
--- a/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_prefs.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_prefs.js
@@ -36,17 +36,17 @@ var WindowWatcher = {
 
     // Simulate auto-disabling any softblocks
     var list = args.wrappedJSObject.list;
     list.forEach(function(aItem) {
       if (!aItem.blocked)
         aItem.disable = true;
     });
 
-    //run the code after the blocklist is closed
+    // run the code after the blocklist is closed
     Services.obs.notifyObservers(null, "addon-blocklist-closed", null);
 
   },
 
   QueryInterface: function(iid) {
     if (iid.equals(Ci.nsIWindowWatcher)
      || iid.equals(Ci.nsISupports))
       return this;
--- a/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_regexp.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_regexp.js
@@ -31,17 +31,17 @@ var WindowWatcher = {
 
     // Simulate auto-disabling any softblocks
     var list = args.wrappedJSObject.list;
     list.forEach(function(aItem) {
       if (!aItem.blocked)
         aItem.disable = true;
     });
 
-    //run the code after the blocklist is closed
+    // run the code after the blocklist is closed
     Services.obs.notifyObservers(null, "addon-blocklist-closed", null);
 
   },
 
   QueryInterface: function(iid) {
     if (iid.equals(Ci.nsIWindowWatcher)
      || iid.equals(Ci.nsISupports))
       return this;
--- a/toolkit/mozapps/extensions/test/xpcshell/test_blocklistchange.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_blocklistchange.js
@@ -340,17 +340,17 @@ var WindowWatcher = {
 
     // Simulate auto-disabling any softblocks
     var list = openArgs.wrappedJSObject.list;
     list.forEach(function(aItem) {
       if (!aItem.blocked)
         aItem.disable = true;
     });
 
-    //run the code after the blocklist is closed
+    // run the code after the blocklist is closed
     Services.obs.notifyObservers(null, "addon-blocklist-closed", null);
 
   },
 
   QueryInterface: function(iid) {
     if (iid.equals(Ci.nsIWindowWatcher)
      || iid.equals(Ci.nsISupports))
       return this;
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug393285.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bug393285.js
@@ -43,17 +43,17 @@ var WindowWatcher = {
 
     // Simulate auto-disabling any softblocks
     var list = args.wrappedJSObject.list;
     list.forEach(function(aItem) {
       if (!aItem.blocked)
         aItem.disable = true;
     });
 
-    //run the code after the blocklist is closed
+    // run the code after the blocklist is closed
     Services.obs.notifyObservers(null, "addon-blocklist-closed", null);
 
   },
 
   QueryInterface: function(iid) {
     if (iid.equals(Ci.nsIWindowWatcher)
      || iid.equals(Ci.nsISupports))
       return this;
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug406118.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bug406118.js
@@ -32,17 +32,17 @@ var WindowWatcher = {
 
     // Simulate auto-disabling any softblocks
     var list = args.wrappedJSObject.list;
     list.forEach(function(aItem) {
       if (!aItem.blocked)
         aItem.disable = true;
     });
 
-    //run the code after the blocklist is closed
+    // run the code after the blocklist is closed
     Services.obs.notifyObservers(null, "addon-blocklist-closed", null);
 
   },
 
   QueryInterface: function(iid) {
     if (iid.equals(Ci.nsIWindowWatcher)
      || iid.equals(Ci.nsISupports))
       return this;
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug455906.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bug455906.js
@@ -140,17 +140,17 @@ var WindowWatcher = {
     // Should be called to list the newly blocklisted items
     do_check_eq(url, URI_EXTENSION_BLOCKLIST_DIALOG);
 
     if (gNotificationCheck) {
       var args = windowArguments.wrappedJSObject;
       gNotificationCheck(args);
     }
 
-    //run the code after the blocklist is closed
+    // run the code after the blocklist is closed
     Services.obs.notifyObservers(null, "addon-blocklist-closed", null);
 
     // Call the next test after the blocklist has finished up
     do_timeout(0, gTestCheck);
   },
 
   QueryInterface: function(iid) {
     if (iid.equals(Ci.nsIWindowWatcher)
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug514327_2.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bug514327_2.js
@@ -27,15 +27,15 @@ function run_test() {
   var prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
 
   prefs.setBoolPref("plugin.load_flash_only", false);
 
   var plugin = get_test_plugintag();
   if (!plugin)
     do_throw("Plugin tag not found");
 
-  //run the code after the blocklist is closed
+  // run the code after the blocklist is closed
   Services.obs.notifyObservers(null, "addon-blocklist-closed", null);
   do_execute_soon(function() {
     // should be marked as outdated by the blocklist
     do_check_true(blocklist.getPluginBlocklistState(plugin, "1", "1.9") == nsIBLS.STATE_OUTDATED);
   });
 }
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug655254.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bug655254.js
@@ -118,17 +118,17 @@ function run_test_1() {
             do_execute_soon(run_test_2);
           });
         }));
       }
     }, AddonManager.UPDATE_WHEN_USER_REQUESTED);
   });
 }
 
-//Set up the profile
+// Set up the profile
 function run_test_2() {
   AddonManager.getAddonByID("addon2@tests.mozilla.org", callback_soon(function(a2) {
    do_check_neq(a2, null);
    do_check_false(a2.appDisabled);
    do_check_true(a2.isActive);
    do_check_false(isExtensionInAddonsList(userDir, a2.id));
    do_check_eq(Services.prefs.getIntPref("bootstraptest.active_version"), 1);
 
--- a/toolkit/mozapps/extensions/test/xpcshell/test_delay_update_webextension.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_delay_update_webextension.js
@@ -2,17 +2,17 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 // This verifies that delaying an update works for WebExtensions.
 
 // The test extension uses an insecure update url.
 Services.prefs.setBoolPref(PREF_EM_CHECK_UPDATE_SECURITY, false);
 
-/*globals browser*/
+/* globals browser*/
 
 const profileDir = gProfD.clone();
 profileDir.append("extensions");
 const tempdir = gTmpD.clone();
 const stageDir = profileDir.clone();
 stageDir.append("staged");
 
 const IGNORE_ID = "test_delay_update_ignore_webext@tests.mozilla.org";
--- a/toolkit/mozapps/extensions/test/xpcshell/test_fuel.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_fuel.js
@@ -96,17 +96,17 @@ function run_test() {
       a.uninstall();
       do_check_eq(gLastEvent, "uninstall");
 
       a.cancelUninstall();
       do_check_eq(gLastEvent, "cancel");
 
       // PREF TESTING
       // Reset the install event preference, so that we can test it again later
-      //inspector.prefs.get("install-event-fired").reset();
+      // inspector.prefs.get("install-event-fired").reset();
 
       // test the value of the preference root
       do_check_eq(extensions.all[0].prefs.root, "extensions.addon1@tests.mozilla.org.");
 
       // test getting nonexistent values
       var itemValue = inspector.prefs.getValue(testdata.missing, "default");
       do_check_eq(itemValue, "default");
 
--- a/toolkit/mozapps/extensions/test/xpcshell/test_install.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_install.js
@@ -1786,17 +1786,17 @@ function run_test_29() {
         "onDownloadEnded"
       ], check_test_29);
       install.install();
     });
   }, "application/x-xpinstall", null, "Addon Test 6", null, "1.0");
 }
 
 function check_test_29(install) {
-  //ensure_test_completed();
+  // ensure_test_completed();
   do_check_eq(install.state, AddonManager.STATE_DOWNLOADED);
   do_check_neq(install.addon, null);
   do_check_false(install.addon.isCompatible);
   do_check_true(install.addon.appDisabled);
 
   prepare_test({}, [
     "onDownloadCancelled"
   ], run_test_30);
--- a/toolkit/mozapps/extensions/test/xpcshell/test_no_addons.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_no_addons.js
@@ -28,17 +28,17 @@ function checkPending() {
   }
 }
 
 function checkString(aPref, aValue) {
   try {
     do_check_eq(Services.prefs.getCharPref(aPref), aValue)
   }
   catch (e) {
-    //OK
+    // OK
   }
 }
 
 // Make sure all our extension state is empty/nonexistent
 function check_empty_state() {
   do_check_false(gExtensionsJSON.exists());
   do_check_false(gExtensionsINI.exists());
 
--- a/toolkit/mozapps/extensions/test/xpcshell/test_softblocked.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_softblocked.js
@@ -25,17 +25,17 @@ var WindowWatcher = {
 
     // Simulate auto-disabling any softblocks
     var list = openArgs.wrappedJSObject.list;
     list.forEach(function(aItem) {
       if (!aItem.blocked)
         aItem.disable = true;
     });
 
-    //run the code after the blocklist is closed
+    // run the code after the blocklist is closed
     Services.obs.notifyObservers(null, "addon-blocklist-closed", null);
   },
 
   QueryInterface: function(iid) {
     if (iid.equals(Ci.nsIWindowWatcher)
      || iid.equals(Ci.nsISupports))
       return this;
 
--- a/toolkit/mozapps/extensions/test/xpcshell/test_undothemeuninstall.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_undothemeuninstall.js
@@ -128,17 +128,17 @@ add_task(function* uninstallEnabledOffer
   do_check_false(d.userDisabled);
   do_check_eq(d.pendingOperations, AddonManager.PENDING_NONE);
 
   do_check_eq(t1, null);
 
   do_check_eq(Services.prefs.getCharPref(PREF_GENERAL_SKINS_SELECTEDSKIN), "classic/1.0");
 });
 
-//Tests that uninstalling an enabled theme can be undone
+// Tests that uninstalling an enabled theme can be undone
 add_task(function* canUndoUninstallEnabled() {
   writeInstallRDFForExtension(theme1, profileDir);
 
   yield promiseRestartManager();
 
   let t1 = yield promiseAddonByID("theme1@tests.mozilla.org");
 
   do_check_neq(t1, null);
@@ -223,17 +223,17 @@ add_task(function* canUndoUninstallEnabl
   do_check_eq(t1.pendingOperations, AddonManager.PENDING_NONE);
 
   do_check_eq(Services.prefs.getCharPref(PREF_GENERAL_SKINS_SELECTEDSKIN), "theme1");
 
   t1.uninstall();
   yield promiseRestartManager();
 });
 
-//Tests that uninstalling a disabled theme offers the option to undo
+// Tests that uninstalling a disabled theme offers the option to undo
 add_task(function* uninstallDisabledOffersUndo() {
   writeInstallRDFForExtension(theme1, profileDir);
 
   yield promiseRestartManager();
 
   let [ t1, d ] = yield promiseAddonsByIDs(["theme1@tests.mozilla.org",
                                             "default@tests.mozilla.org"]);
 
@@ -278,17 +278,17 @@ add_task(function* uninstallDisabledOffe
   do_check_false(d.userDisabled);
   do_check_eq(d.pendingOperations, AddonManager.PENDING_NONE);
 
   do_check_eq(t1, null);
 
   do_check_eq(Services.prefs.getCharPref(PREF_GENERAL_SKINS_SELECTEDSKIN), "classic/1.0");
 });
 
-//Tests that uninstalling a disabled theme can be undone
+// Tests that uninstalling a disabled theme can be undone
 add_task(function* canUndoUninstallDisabled() {
   writeInstallRDFForExtension(theme1, profileDir);
 
   yield promiseRestartManager();
 
   let [ t1, d ] = yield promiseAddonsByIDs(["theme1@tests.mozilla.org",
                                             "default@tests.mozilla.org"]);
 
@@ -357,17 +357,17 @@ add_task(function* canUndoUninstallDisab
   do_check_eq(t1.pendingOperations, AddonManager.PENDING_NONE);
 
   do_check_eq(Services.prefs.getCharPref(PREF_GENERAL_SKINS_SELECTEDSKIN), "classic/1.0");
 
   t1.uninstall();
   yield promiseRestartManager();
 });
 
-//Tests that uninstalling an enabled lightweight theme offers the option to undo
+// Tests that uninstalling an enabled lightweight theme offers the option to undo
 add_task(function* uninstallLWTOffersUndo() {
   // skipped since lightweight themes don't support undoable uninstall yet
   return;
   LightweightThemeManager.currentTheme = dummyLWTheme("theme1");
 
   let [ t1, d ] = yield promiseAddonsByIDs(["theme1@personas.mozilla.org",
                                             "default@tests.mozilla.org"]);
 
--- a/toolkit/mozapps/extensions/test/xpcshell/test_undouninstall.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_undouninstall.js
@@ -248,17 +248,17 @@ add_task(function* uninstallInactiveIsCa
     ]
   });
   a1.cancelUninstall();
   ensure_test_completed();
 
   yield promiseRestartManager();
 });
 
-//Test that an inactive item can be uninstalled
+// Test that an inactive item can be uninstalled
 add_task(function* uninstallInactive() {
   let a1 = yield promiseAddonByID("addon1@tests.mozilla.org");
 
   do_check_neq(a1, null);
   do_check_false(a1.isActive);
   do_check_true(a1.userDisabled);
   do_check_false(isExtensionInAddonsList(profileDir, a1.id));
 
@@ -330,17 +330,17 @@ add_task(function* uninstallRestartless(
   ensure_test_completed();
 
   a1 = yield promiseAddonByID(ID);
 
   do_check_eq(a1, null);
   BootstrapMonitor.checkAddonNotStarted(ID);
 });
 
-//Tests that an enabled restartless add-on can be uninstalled and then cancelled
+// Tests that an enabled restartless add-on can be uninstalled and then cancelled
 add_task(function* cancelUninstallOfRestartless() {
   prepare_test({
     "undouninstall1@tests.mozilla.org": [
       ["onInstalling", false],
       "onInstalled"
     ]
   }, [
     "onNewInstall",
@@ -542,17 +542,17 @@ add_task(function* uninstallDisabledRest
   a1 = yield promiseAddonByID("undouninstall1@tests.mozilla.org");
 
   do_check_eq(a1, null);
   BootstrapMonitor.checkAddonNotStarted(ID);
   BootstrapMonitor.checkAddonNotInstalled(ID);
   do_check_eq(getUninstallReason(ID), ADDON_UNINSTALL);
 });
 
-//Tests that a disabled restartless add-on can be uninstalled and then cancelled
+// Tests that a disabled restartless add-on can be uninstalled and then cancelled
 add_task(function* cancelUninstallDisabledRestartless() {
   prepare_test({
     "undouninstall1@tests.mozilla.org": [
       ["onInstalling", false],
       "onInstalled"
     ]
   }, [
     "onNewInstall",
@@ -628,18 +628,18 @@ add_task(function* cancelUninstallDisabl
   BootstrapMonitor.checkAddonInstalled(ID);
   do_check_eq(a1.pendingOperations, AddonManager.PENDING_NONE);
   do_check_false(a1.isActive);
   do_check_true(a1.userDisabled);
 
   a1.uninstall();
 });
 
-//Tests that reinstalling a disabled restartless add-on waiting to be
-//uninstalled aborts the uninstall and leaves the add-on disabled
+// Tests that reinstalling a disabled restartless add-on waiting to be
+// uninstalled aborts the uninstall and leaves the add-on disabled
 add_task(function* reinstallDisabledAddonAwaitingUninstall() {
   yield promiseInstallAllFiles([do_get_addon("test_undouninstall1")]);
 
   let a1 = yield promiseAddonByID("undouninstall1@tests.mozilla.org");
 
   do_check_neq(a1, null);
   BootstrapMonitor.checkAddonInstalled(ID, "1.0");
   BootstrapMonitor.checkAddonStarted(ID, "1.0");
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_auth3.js
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser_auth3.js
@@ -1,14 +1,14 @@
 // ----------------------------------------------------------------------------
 // Test whether an install fails when authentication is required and it is
 // canceled
 // This verifies bug 312473
 
-///////////////////
+// /////////////////
 //
 // Whitelisting this test.
 // As part of bug 1077403, the leaking uncaught rejection should be fixed.
 //
 thisTestLeaksUncaughtRejectionsAndShouldBeFixed("TypeError: this.docShell is null");
 
 
 function test() {
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_auth4.js
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser_auth4.js
@@ -1,9 +1,9 @@
-///////////////////
+// /////////////////
 //
 // Whitelisting this test.
 // As part of bug 1077403, the leaking uncaught rejection should be fixed.
 //
 thisTestLeaksUncaughtRejectionsAndShouldBeFixed("TypeError: this.docShell is null");
 
 
 // ----------------------------------------------------------------------------
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_concurrent_installs.js
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser_concurrent_installs.js
@@ -1,17 +1,17 @@
 // Test that having two frames that request installs at the same time doesn't
 // cause callback ID conflicts (discussed in bug 926712)
 
 var gConcurrentTabs = [];
 var gQueuedForInstall = [];
 var gResults = [];
 
 function frame_script() {
-  /*globals addMessageListener, sendAsyncMessage*/
+  /* globals addMessageListener, sendAsyncMessage*/
   addMessageListener("Test:StartInstall", () => {
     content.document.getElementById("installnow").click()
   });
 
   addEventListener("load", () => {
     sendAsyncMessage("Test:Loaded");
 
     content.addEventListener("InstallComplete", (e) => {
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_localfile.js
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser_localfile.js
@@ -8,17 +8,17 @@ function test() {
   var cr = Components.classes["@mozilla.org/chrome/chrome-registry;1"]
                      .getService(Components.interfaces.nsIChromeRegistry);
 
   var chromeroot = extractChromeRoot(gTestPath);
   var xpipath = chromeroot + "unsigned.xpi";
   try {
     xpipath = cr.convertChromeURL(makeURI(chromeroot + "amosigned.xpi")).spec;
   } catch (ex) {
-    //scenario where we are running from a .jar and already extracted
+    // scenario where we are running from a .jar and already extracted
   }
 
   gBrowser.selectedTab = gBrowser.addTab("about:blank");
   BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser).then(() => {
     gBrowser.loadURI(xpipath);
   });
 }
 
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_localfile2.js
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser_localfile2.js
@@ -7,17 +7,17 @@ function test() {
   var cr = Components.classes["@mozilla.org/chrome/chrome-registry;1"]
                      .getService(Components.interfaces.nsIChromeRegistry);
 
   var chromeroot = getChromeRoot(gTestPath);
   var xpipath = chromeroot + "amosigned.xpi";
   try {
     xpipath = cr.convertChromeURL(makeURI(xpipath)).spec;
   } catch (ex) {
-    //scenario where we are running from a .jar and already extracted
+    // scenario where we are running from a .jar and already extracted
   }
 
   var triggers = encodeURIComponent(JSON.stringify({
     "Unsigned XPI": xpipath
   }));
   gBrowser.selectedTab = gBrowser.addTab();
 
   function loadListener() {
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_localfile3.js
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser_localfile3.js
@@ -12,17 +12,17 @@ function test() {
   var cr = Components.classes["@mozilla.org/chrome/chrome-registry;1"]
                      .getService(Components.interfaces.nsIChromeRegistry);
 
   var chromeroot = extractChromeRoot(gTestPath);
   var xpipath = chromeroot + "amosigned.xpi";
   try {
     xpipath = cr.convertChromeURL(makeURI(xpipath)).spec;
   } catch (ex) {
-    //scenario where we are running from a .jar and already extracted
+    // scenario where we are running from a .jar and already extracted
   }
 
   gBrowser.selectedTab = gBrowser.addTab("about:blank");
   BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser).then(() => {
     gBrowser.loadURI(xpipath);
   });
 }
 
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_localfile4.js
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser_localfile4.js
@@ -12,17 +12,17 @@ function test() {
   var cr = Components.classes["@mozilla.org/chrome/chrome-registry;1"]
                      .getService(Components.interfaces.nsIChromeRegistry);
 
   var chromeroot = extractChromeRoot(gTestPath);
   var xpipath = chromeroot;
   try {
     xpipath = cr.convertChromeURL(makeURI(chromeroot)).spec;
   } catch (ex) {
-    //scenario where we are running from a .jar and already extracted
+    // scenario where we are running from a .jar and already extracted
   }
   var triggers = encodeURIComponent(JSON.stringify({
     "Unsigned XPI": TESTROOT + "amosigned.xpi"
   }));
   gBrowser.selectedTab = gBrowser.addTab();
   gBrowser.loadURI(xpipath + "installtrigger.html?" + triggers);
 }
 
--- a/toolkit/mozapps/extensions/test/xpinstall/bug645699.html
+++ b/toolkit/mozapps/extensions/test/xpinstall/bug645699.html
@@ -1,17 +1,17 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
           "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html>
 
 <head>
 <title>InstallTrigger tests</title>
 <script type="text/javascript">
-/*globals InstallTrigger*/
+/* globals InstallTrigger */
 function startInstall() {
   var whiteUrl = "https://example.org/";
 
   try {
     Object.defineProperty(window, "location", { value : { href : whiteUrl }	});
     throw new Error("Object.defineProperty(window, 'location', ...) should have thrown");
   } catch (exc) {
     if (!(exc instanceof TypeError))
--- a/toolkit/mozapps/extensions/test/xpinstall/concurrent_installs.html
+++ b/toolkit/mozapps/extensions/test/xpinstall/concurrent_installs.html
@@ -2,17 +2,17 @@
           "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html>
 
 <head>
   <meta charset="utf-8">
 <title>Concurrent InstallTrigger tests</title>
 <script type="text/javascript">
-/*globals InstallTrigger*/
+/* globals InstallTrigger */
 function installCallback(url, status) {
   document.getElementById("status").textContent = status;
 
   dump("Sending InstallComplete\n");
   var event = new CustomEvent("InstallComplete", {detail: {loc: location.href, xpi: url}});
   window.dispatchEvent(event);
 }
 
--- a/toolkit/mozapps/extensions/test/xpinstall/enabled.html
+++ b/toolkit/mozapps/extensions/test/xpinstall/enabled.html
@@ -3,17 +3,17 @@
 
 <html>
 
 <!-- This page will test if InstallTrigger seems to be enabled -->
 
 <head>
 <title>InstallTrigger tests</title>
 <script type="text/javascript">
-/*globals InstallTrigger*/
+/* globals InstallTrigger */
 function init() {
   document.getElementById("enabled").textContent = InstallTrigger.enabled() ? "true" : "false";
   dump("Sending PageLoaded\n");
   var event = new CustomEvent("PageLoaded");
   window.dispatchEvent(event);
 }
 </script>
 </head>
--- a/toolkit/mozapps/extensions/test/xpinstall/installchrome.html
+++ b/toolkit/mozapps/extensions/test/xpinstall/installchrome.html
@@ -3,17 +3,17 @@
 
 <html>
 
 <!-- This page will accept a url as the uri query and pass it to InstallTrigger.installChrome -->
 
 <head>
 <title>InstallTrigger tests</title>
 <script type="text/javascript">
-/*globals InstallTrigger*/
+/* globals InstallTrigger */
 function startInstall() {
   InstallTrigger.installChrome(InstallTrigger.SKIN,
                                decodeURIComponent(document.location.search.substring(1)),
                                "test");
 }
 </script>
 </head>
 <body onload="startInstall()">
--- a/toolkit/mozapps/extensions/test/xpinstall/installtrigger.html
+++ b/toolkit/mozapps/extensions/test/xpinstall/installtrigger.html
@@ -3,17 +3,17 @@
 
 <html>
 
 <!-- This page will accept some json as the uri query and pass it to InstallTrigger.install -->
 
 <head>
 <title>InstallTrigger tests</title>
 <script type="text/javascript">
-/*globals InstallTrigger*/
+/* globals InstallTrigger */
 function installCallback(url, status) {
   document.getElementById("status").textContent = status;
 
   dump("Sending InstallComplete\n");
   var event = new CustomEvent("InstallComplete");
   var target = window.parent ? window.parent : window;
   target.dispatchEvent(event);
 }
--- a/toolkit/mozapps/extensions/test/xpinstall/startsoftwareupdate.html
+++ b/toolkit/mozapps/extensions/test/xpinstall/startsoftwareupdate.html
@@ -3,17 +3,17 @@
 
 <html>
 
 <!-- This page will accept a url as the uri query and pass it to InstallTrigger.startSoftwareUpdate -->
 
 <head>
 <title>InstallTrigger tests</title>
 <script type="text/javascript">
-/*globals InstallTrigger*/
+/* globals InstallTrigger */
 function startInstall() {
   InstallTrigger.startSoftwareUpdate(decodeURIComponent(document.location.search.substring(1)));
 }
 </script>
 </head>
 <body onload="startInstall()">
 <p>InstallTrigger tests</p>
 </body>
--- a/toolkit/mozapps/extensions/test/xpinstall/triggerredirect.html
+++ b/toolkit/mozapps/extensions/test/xpinstall/triggerredirect.html
@@ -3,17 +3,17 @@
 
 <html>
 
 <!-- This page will attempt an install and then try to load a new page in the tab -->
 
 <head>
 <title>InstallTrigger tests</title>
 <script type="text/javascript">
-/*globals InstallTrigger*/
+/* globals InstallTrigger */
 function installCallback(url, status) {
   document.location = "#foo";
 
   dump("Sending InstallComplete\n");
   var event = new CustomEvent("InstallComplete");
   window.dispatchEvent(event);
 }
 
--- a/toolkit/mozapps/handling/content/dialog.js
+++ b/toolkit/mozapps/handling/content/dialog.js
@@ -32,28 +32,28 @@ var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cr = Components.results;
 var Cu = Components.utils;
 
 Cu.import("resource://gre/modules/SharedPromptUtils.jsm");
 
 
 var dialog = {
-  //////////////////////////////////////////////////////////////////////////////
-  //// Member Variables
+  // ////////////////////////////////////////////////////////////////////////////
+  // // Member Variables
 
   _handlerInfo: null,
   _URI: null,
   _itemChoose: null,
   _okButton: null,
   _windowCtxt: null,
   _buttonDisabled: true,
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// Methods
+  // ////////////////////////////////////////////////////////////////////////////
+  // // Methods
 
  /**
   * This function initializes the content of the dialog.
   */
   initialize: function initialize()
   {
     this._handlerInfo = window.arguments[7].QueryInterface(Ci.nsIHandlerInfo);
     this._URI         = window.arguments[8].QueryInterface(Ci.nsIURI);
@@ -258,18 +258,18 @@ var dialog = {
   onDblClick: function onDblClick()
   {
     if (this.selectedItem == this._itemChoose)
       this.chooseApplication();
     else
       document.documentElement.acceptDialog();
   },
 
-  /////////////////////////////////////////////////////////////////////////////
-  //// Getters / Setters
+  // ///////////////////////////////////////////////////////////////////////////
+  // // Getters / Setters
 
  /**
   * Returns/sets the selected element in the richlistbox
   */
   get selectedItem()
   {
     return document.getElementById("items").selectedItem;
   },
--- a/toolkit/mozapps/handling/nsContentDispatchChooser.js
+++ b/toolkit/mozapps/handling/nsContentDispatchChooser.js
@@ -1,37 +1,37 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
-////////////////////////////////////////////////////////////////////////////////
-//// Constants
+// //////////////////////////////////////////////////////////////////////////////
+// // Constants
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cr = Components.results;
 
 const CONTENT_HANDLING_URL = "chrome://mozapps/content/handling/dialog.xul";
 const STRINGBUNDLE_URL = "chrome://mozapps/locale/handling/handling.properties";
 
-////////////////////////////////////////////////////////////////////////////////
-//// nsContentDispatchChooser class
+// //////////////////////////////////////////////////////////////////////////////
+// // nsContentDispatchChooser class
 
 function nsContentDispatchChooser()
 {
 }
 
 nsContentDispatchChooser.prototype =
 {
   classID: Components.ID("e35d5067-95bc-4029-8432-e8f1e431148d"),
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsIContentDispatchChooser
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsIContentDispatchChooser
 
   ask: function ask(aHandler, aWindowContext, aURI, aReason)
   {
     var window = null;
     try {
       if (aWindowContext)
         window = aWindowContext.getInterface(Ci.nsIDOMWindow);
     } catch (e) { /* it's OK to not have a window */ }
@@ -71,20 +71,20 @@ nsContentDispatchChooser.prototype =
              getService(Ci.nsIWindowWatcher);
     ww.openWindow(window,
                   CONTENT_HANDLING_URL,
                   null,
                   "chrome,dialog=yes,resizable,centerscreen",
                   params);
   },
 
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsISupports
+  // ////////////////////////////////////////////////////////////////////////////
+  // // nsISupports
 
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentDispatchChooser])
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// Module
+// //////////////////////////////////////////////////////////////////////////////
+// // Module
 
 var components = [nsContentDispatchChooser];
 
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);
--- a/toolkit/mozapps/preferences/changemp.js
+++ b/toolkit/mozapps/preferences/changemp.js
@@ -160,35 +160,35 @@ function setPasswordStrength()
 // Here is how we weigh the quality of the password
 // number of characters
 // numbers
 // non-alpha-numeric chars
 // upper and lower case characters
 
   var pw=document.getElementById('pw1').value;
 
-//length of the password
+// length of the password
   var pwlength=(pw.length);
   if (pwlength>5)
     pwlength=5;
 
 
-//use of numbers in the password
+// use of numbers in the password
   var numnumeric = pw.replace (/[0-9]/g, "");
   var numeric=(pw.length - numnumeric.length);
   if (numeric>3)
     numeric=3;
 
-//use of symbols in the password
+// use of symbols in the password
   var symbols = pw.replace (/\W/g, "");
   var numsymbols=(pw.length - symbols.length);
   if (numsymbols>3)
     numsymbols=3;
 
-//use of uppercase in the password
+// use of uppercase in the password
   var numupper = pw.replace (/[A-Z]/g, "");
   var upper=(pw.length - numupper.length);
   if (upper>3)
     upper=3;
 
 
   var pwstrength=((pwlength*10)-20) + (numeric*10) + (numsymbols*15) + (upper*10);
 
--- a/toolkit/mozapps/update/nsUpdateService.js
+++ b/toolkit/mozapps/update/nsUpdateService.js
@@ -4553,17 +4553,17 @@ UpdatePrompt.prototype = {
    *          An update to pass to the UI in the window arguments.
    *          Can be null
    */
   _showUI: function UP__showUI(parent, uri, features, name, page, update) {
     var ary = null;
     if (update) {
       ary = Cc["@mozilla.org/array;1"].
             createInstance(Ci.nsIMutableArray);
-      ary.appendElement(update, /*weak =*/ false);
+      ary.appendElement(update, /* weak =*/ false);
     }
 
     var win = this._getUpdateWindow();
     if (win) {
       if (page && "setCurrentPage" in win)
         win.setCurrentPage(page);
       win.focus();
     }
--- a/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
+++ b/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
@@ -3944,18 +3944,18 @@ function adjustGeneralPaths() {
       debugDump("finish - kill process");
     }
 
     if (gHandle) {
       try {
         debugDump("start - closing handle");
         let kernel32 = ctypes.open("kernel32");
         let CloseHandle = kernel32.declare("CloseHandle", ctypes.default_abi,
-                                           ctypes.bool, /*return*/
-                                           ctypes.voidptr_t /*handle*/);
+                                           ctypes.bool, /* return*/
+                                           ctypes.voidptr_t /* handle*/);
         if (!CloseHandle(gHandle)) {
           debugDump("call to CloseHandle failed");
         }
         kernel32.close();
         gHandle = null;
         debugDump("finish - closing handle");
       } catch (e) {
         debugDump("call to CloseHandle failed. Exception: " + e);
--- a/toolkit/mozapps/update/tests/unit_aus_update/remoteUpdateXML.js
+++ b/toolkit/mozapps/update/tests/unit_aus_update/remoteUpdateXML.js
@@ -126,17 +126,17 @@ function check_test_pt02() {
   // nsIUpdate:state returns an empty string when no action has been performed
   // on an available update
   Assert.equal(bestUpdate.state, "",
                "the update state attribute" + MSG_SHOULD_EQUAL);
   Assert.equal(bestUpdate.errorCode, 0,
                "the update errorCode attribute" + MSG_SHOULD_EQUAL);
   Assert.equal(bestUpdate.patchCount, 2,
                "the update patchCount attribute" + MSG_SHOULD_EQUAL);
-  //XXX TODO - test nsIUpdate:serialize
+  // XXX TODO - test nsIUpdate:serialize
 
   Assert.equal(bestUpdate.getProperty("custom1_attr"), "custom1 value",
                "the update custom1_attr property" + MSG_SHOULD_EQUAL);
   Assert.equal(bestUpdate.getProperty("custom2_attr"), "custom2 value",
                "the update custom2_attr property" + MSG_SHOULD_EQUAL);
 
   let patch = bestUpdate.getPatchAt(0);
   Assert.equal(patch.type, "complete",
@@ -154,34 +154,34 @@ function check_test_pt02() {
   // failure output will show a failure for null == null. To lessen the
   // confusion first check that the typeof for patch.state is string.
   Assert.equal(typeof(patch.state), "string",
                "the update patch state typeof value should equal |string|");
   Assert.equal(patch.state, STATE_NONE,
                "the update patch state attribute" + MSG_SHOULD_EQUAL);
   Assert.ok(!patch.selected,
             "the update patch selected attribute" + MSG_SHOULD_EQUAL);
-  //XXX TODO - test nsIUpdatePatch:serialize
+  // XXX TODO - test nsIUpdatePatch:serialize
 
   patch = bestUpdate.getPatchAt(1);
   Assert.equal(patch.type, "partial",
                "the update patch type attribute" + MSG_SHOULD_EQUAL);
   Assert.equal(patch.URL, "http://partial/",
                "the update patch URL attribute" + MSG_SHOULD_EQUAL);
   Assert.equal(patch.hashFunction, "SHA1",
                "the update patch hashFunction attribute" + MSG_SHOULD_EQUAL);
   Assert.equal(patch.hashValue, "e6678ca40ae7582316acdeddf3c133c9c8577de4",
                "the update patch hashValue attribute" + MSG_SHOULD_EQUAL);
   Assert.equal(patch.size, 1316138,
                "the update patch size attribute" + MSG_SHOULD_EQUAL);
   Assert.equal(patch.state, STATE_NONE,
                "the update patch state attribute" + MSG_SHOULD_EQUAL);
   Assert.ok(!patch.selected,
             "the update patch selected attribute" + MSG_SHOULD_EQUAL);
-  //XXX TODO - test nsIUpdatePatch:serialize
+  // XXX TODO - test nsIUpdatePatch:serialize
 
   run_test_pt03();
 }
 
 // Empty update xml (an empty xml file returns a root node name of parsererror)
 function run_test_pt03() {
   gResponseBody = "<parsererror/>";
   run_test_helper_pt1("testing empty update xml",