Bug 848519 - Part 2: Update Makefile.in and test harness. r=gavin

services/common/Makefile.in

@@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk
 
 modules := \
   log4moz.js \
-  preferences.js \
   storageservice.js \
   stringbundle.js \
   tokenserverclient.js \

services/common/tests/unit/test_load_modules.js

@@ -5,7 +5,6 @@ const modules = [
   "async.js",
   "bagheeraclient.js",
   "log4moz.js",
-  "preferences.js",
   "rest.js",
   "storageservice.js",
   "stringbundle.js",

services/common/tests/unit/xpcshell.ini

@@ -27,7 +27,6 @@ firefox-appdir = browser
 [test_bagheera_client.js]
 [test_log4moz.js]
 [test_observers.js]
-[test_preferences.js]
 [test_restrequest.js]
 [test_tokenauthenticatedrequest.js]
 

toolkit/modules/Makefile.in

@@ -11,6 +11,7 @@ include $(DEPTH)/config/autoconf.mk
 
 EXTRA_JS_MODULES := \
   NewTabUtils.jsm \
+	Preferences.jsm \
   Sqlite.jsm \
   TelemetryTimestamps.jsm \
   Timer.jsm \

toolkit/modules/tests/xpcshell/test_Preferences.js

@@ -1,7 +1,9 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-Cu.import("resource://services-common/preferences.js");
+const {classes: Cc, interfaces: Ci, results: Cr, utils: Cu, manager: Cm} = Components;
+
+Cu.import("resource://gre/modules/Preferences.jsm");
 
 function run_test() {
   run_next_test();

toolkit/modules/tests/xpcshell/xpcshell.ini

@@ -3,6 +3,7 @@ head =
 tail =
 
 [test_newtab-migrate-v1.js]
+[test_Preferences.js]
 [test_sqlite.js]
 [test_TelemetryTimestamps.js]
 [test_timer.js]