mozilla-inbound: changeset 389920:943f22d90aca3ac389b97c9ac3b19452ec130f4a

author	Nicholas Nethercote <nnethercote@mozilla.com>
	Tue, 31 Oct 2017 16:34:38 +1100
changeset 389920	943f22d90aca3ac389b97c9ac3b19452ec130f4a
parent 389919	14a5ae97c682ed92861492a1e51f041b6d6cef40
child 389921	43c726ab7f71353f4b8d0c14bca27d65edc6ad99
push id	96953
push user	nnethercote@mozilla.com
push date	Fri, 03 Nov 2017 02:48:26 +0000
treeherder	mozilla-inbound@43c726ab7f71 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	glandium
bugs	1413413
milestone	58.0a1
first release with	nightly linux32 14fd26761bc4 / 58.0a1 / 20171104100412 / files nightly linux64 14fd26761bc4 / 58.0a1 / 20171104100412 / files nightly mac 14fd26761bc4 / 58.0a1 / 20171104100412 / files nightly win32 14fd26761bc4 / 58.0a1 / 20171104100412 / files nightly win64 14fd26761bc4 / 58.0a1 / 20171104100412 / files
last release without	nightly linux32 b2f459b88cab / 58.0a1 / 20171102222620 / files nightly linux64 b2f459b88cab / 58.0a1 / 20171102222620 / files nightly mac b2f459b88cab / 58.0a1 / 20171102222620 / files nightly win32 b2f459b88cab / 58.0a1 / 20171102222620 / files nightly win64 b2f459b88cab / 58.0a1 / 20171102222620 / files

--- a/modules/libpref/Preferences.cpp
+++ b/modules/libpref/Preferences.cpp
@@ -5380,18 +5380,16 @@ static mozilla::Module::CIDEntry kPrefCI
   { &kRelativeFilePrefCID, false, nullptr, nsRelativeFilePrefConstructor },
   { nullptr }
 };
 
 static mozilla::Module::ContractIDEntry kPrefContracts[] = {
   { NS_PREFSERVICE_CONTRACTID, &kPrefServiceCID },
   { NS_PREFLOCALIZEDSTRING_CONTRACTID, &kPrefLocalizedStringCID },
   { NS_RELATIVEFILEPREF_CONTRACTID, &kRelativeFilePrefCID },
-  // compatibility for extension that uses old service
-  { "@mozilla.org/preferences;1", &kPrefServiceCID },
   { nullptr }
 };
 
 static void
 UnloadPrefsModule()
 {
   Preferences::Shutdown();
 }