Bug 772127 - Run Contacts and Settings API tests on desktop. r=sicking

dom/contacts/Makefile.in

@@ -11,9 +11,7 @@ VPATH            = \
 
 include $(DEPTH)/config/autoconf.mk
 
-ifeq ($(MOZ_BUILD_APP), $(filter $(MOZ_BUILD_APP),b2g mail))
 VPATH += $(srcdir)/fallback
-endif
 
 MODULE         = dom
 LIBRARY_NAME   = jsdomcontacts_s
@@ -27,12 +25,10 @@ EXTRA_COMPONENTS =        \
   ContactManager.manifest \
   $(NULL)
 
-ifeq ($(MOZ_BUILD_APP), $(filter $(MOZ_BUILD_APP),b2g mail))
 EXTRA_JS_MODULES =   \
   ContactService.jsm \
   ContactDB.jsm      \
   $(NULL)
-endif
 
 TEST_DIRS += tests
 

dom/contacts/tests/test_contacts_basics.html

@@ -21,6 +21,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id={674720}
 
 "use strict";
 
+var comp = SpecialPowers.wrap(Components);
+comp.utils.import("resource://gre/modules/ContactService.jsm");
+SpecialPowers.setBoolPref("dom.mozContacts.enabled", true);
 SpecialPowers.addPermission("webcontacts-manage", true, document);
 
 // For Sorting

dom/settings/tests/test_settings_basics.html

@@ -21,6 +21,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id={678695}
 
 "use strict";
 
+var comp = SpecialPowers.wrap(Components);
+comp.utils.import("resource://gre/modules/SettingsChangeNotifier.jsm");
+SpecialPowers.setBoolPref("dom.mozSettings.enabled", true);
 SpecialPowers.addPermission("websettings-read", true, document);
 SpecialPowers.addPermission("websettings-readwrite", true, document);