Bug 1572621 - Merge services-common.js into all.js. r=markh

Differential Revision: https://phabricator.services.mozilla.com/D41322

--HG--
extra : moz-landing-system : lando

.prettierignore

@@ -29,7 +29,6 @@ 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

modules/libpref/init/all.js

@@ -5653,3 +5653,7 @@ pref("fission.preserve_browsing_contexts", false);
 //  * 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");

services/common/moz.build

@@ -36,8 +36,4 @@ TESTING_JS_MODULES.services.common += [
     'modules-testing/logging.js',
 ]
 
-JS_PREFERENCE_FILES += [
-    'services-common.js',
-]
-
 SPHINX_TREES['services'] = 'docs'

services/common/services-common.js

@@ -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");