3 files changed, 1 insertions, 11 deletions
diff --git a/toolkit/components/cookie/jar.mn b/toolkit/components/cookie/jar.mn
index 109e6cd4f..2826bbcd6 100644
--- a/toolkit/components/cookie/jar.mn
+++ b/toolkit/components/cookie/jar.mn
@@ -3,8 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 toolkit.jar:
-#ifndef MOZ_FENNEC
 % content cookie %content/cookie/
   content/cookie/cookieAcceptDialog.xul          (content/cookieAcceptDialog.xul)
   content/cookie/cookieAcceptDialog.js           (content/cookieAcceptDialog.js)
-#endif
diff --git a/toolkit/components/search/moz.build b/toolkit/components/search/moz.build
index 2f8b3e54c..43414963d 100644
--- a/toolkit/components/search/moz.build
+++ b/toolkit/components/search/moz.build
@@ -11,7 +11,7 @@ EXTRA_PP_COMPONENTS += [
     'toolkitsearch.manifest',
 ]
 
-if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_FENNEC'] or CONFIG['MOZ_XULRUNNER']:
+if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_XULRUNNER']:
     DEFINES['HAVE_SIDEBAR'] = True
     EXTRA_COMPONENTS += ['nsSidebar.js']
 
diff --git a/toolkit/components/search/nsSearchService.js b/toolkit/components/search/nsSearchService.js
index 82f8d155a..19f4048b4 100644
--- a/toolkit/components/search/nsSearchService.js
+++ b/toolkit/components/search/nsSearchService.js
@@ -4204,10 +4204,6 @@ SearchService.prototype = {
     Services.obs.addObserver(this, SEARCH_ENGINE_TOPIC, false);
     Services.obs.addObserver(this, QUIT_APPLICATION_TOPIC, false);
 
-#ifdef MOZ_FENNEC
-    Services.prefs.addObserver(LOCALE_PREF, this, false);
-#endif
-
     // The current stage of shutdown. Used to help analyze crash
     // signatures in case of shutdown timeout.
     let shutdownState = {
@@ -4252,10 +4248,6 @@ SearchService.prototype = {
   _removeObservers: function SRCH_SVC_removeObservers() {
     Services.obs.removeObserver(this, SEARCH_ENGINE_TOPIC);
     Services.obs.removeObserver(this, QUIT_APPLICATION_TOPIC);
-
-#ifdef MOZ_FENNEC
-    Services.prefs.removeObserver(LOCALE_PREF, this);
-#endif
   },
 
   QueryInterface: function SRCH_SVC_QI(aIID) {