Bug 1572621 - Merge services-common.js into all.js. r=markh
authorNicholas Nethercote <nnethercote@mozilla.com>
Fri, 09 Aug 2019 09:18:27 +0000
changeset 487158 4c8140acc8ea31f6e0d6dea7b699615015e717cf
parent 487157 334875e4ddf4a48444bb30bf157b016f344f61f4
child 487159 6709b85b9571b152ae46056ee414dcad7a158b75
push id36413
push usercsabou@mozilla.com
push dateFri, 09 Aug 2019 21:56:59 +0000
treeherdermozilla-central@2909b0a1eb06 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmarkh
bugs1572621
milestone70.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1572621 - Merge services-common.js into all.js. r=markh Differential Revision: https://phabricator.services.mozilla.com/D41322
.prettierignore
modules/libpref/init/all.js
services/common/moz.build
services/common/services-common.js
--- a/.prettierignore
+++ b/.prettierignore
@@ -24,17 +24,16 @@ mobile/android/app/geckoview-prefs.js
 mobile/android/app/mobile.js
 mobile/android/installer/mobile-l10n.js
 modules/libpref/init/all.js
 modules/libpref/test/unit/data/testParser.js
 modules/libpref/test/unit/data/testPrefLocked.js
 modules/libpref/test/unit/data/testPrefSticky.js
 modules/libpref/test/unit/extdata/testExt.js
 remote/pref/remote.js
-services/common/services-common.js
 services/sync/services-sync.js
 services/sync/tests/unit/prefs_test_prefs_store.js
 testing/marionette/prefs/marionette.js
 toolkit/components/telemetry/datareporting-prefs.js
 toolkit/components/telemetry/healthreport-prefs.js
 
 # Ignore testing pref files which aren't parsed normally.
 testing/profiles/**/user.js
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -5648,8 +5648,12 @@ pref("fission.rebuild_frameloaders_on_re
 // true in bug 1550571.
 pref("fission.preserve_browsing_contexts", false);
 
 // Support for legacy customizations that rely on checking the
 // user profile directory for these stylesheets:
 //  * userContent.css
 //  * userChrome.css
 pref("toolkit.legacyUserProfileCustomizations.stylesheets", false);
+
+pref("services.common.log.logger.rest.request", "Debug");
+pref("services.common.log.logger.rest.response", "Debug");
+pref("services.common.log.logger.tokenserverclient", "Debug");
--- a/services/common/moz.build
+++ b/services/common/moz.build
@@ -31,13 +31,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'andr
         'hawkrequest.js',
         'tokenserverclient.js',
     ]
 
 TESTING_JS_MODULES.services.common += [
     'modules-testing/logging.js',
 ]
 
-JS_PREFERENCE_FILES += [
-    'services-common.js',
-]
-
 SPHINX_TREES['services'] = 'docs'
deleted file mode 100644
--- a/services/common/services-common.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/* 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 contains default preference values for components in
-// services-common.
-
-/* global pref */
-
-pref("services.common.log.logger.rest.request", "Debug");
-pref("services.common.log.logger.rest.response", "Debug");
-
-pref("services.common.log.logger.tokenserverclient", "Debug");