12 files changed, 0 insertions, 4 deletions
diff --git a/browser/base/content/browser-safebrowsing.js b/browser/base/content/browser-safebrowsing.js
index a66595b2d..430d84f13 100644
--- a/browser/base/content/browser-safebrowsing.js
+++ b/browser/base/content/browser-safebrowsing.js
@@ -2,7 +2,6 @@
  * 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/. */
 
-#ifdef MOZ_SAFE_BROWSING
 var gSafeBrowsing = {
 
   setReportPhishingMenu: function() {
@@ -47,4 +46,3 @@ var gSafeBrowsing = {
     return SafeBrowsing.getReportURL(name, gBrowser.currentURI);
   }
 }
-#endif
diff --git a/browser/components/preferences/blocklists.js b/browser/components/preferences/blocklists.js
index c0ce5b656..bc39eb6bd 100644
--- a/browser/components/preferences/blocklists.js
+++ b/browser/components/preferences/blocklists.js
@@ -6,11 +6,9 @@ Components.utils.import("resource://gre/modules/Services.jsm");
 const BASE_LIST_ID = "base";
 const CONTENT_LIST_ID = "content";
 const TRACK_SUFFIX = "-track-digest256";
-#ifdef MOZ_SAFE_BROWSING
 const TRACKING_TABLE_PREF = "urlclassifier.trackingTable";
 const LISTS_PREF_BRANCH = "browser.safebrowsing.provider.mozilla.lists.";
 const UPDATE_TIME_PREF = "browser.safebrowsing.provider.mozilla.nextupdatetime";
-#endif
 
 var gBlocklistManager = {
   _type: "",
diff --git a/browser/themes/linux/social/services-16.png b/browser/themes/linux/social/services-16.png
deleted file mode 100644
index 7001ea1f0..000000000
--- a/browser/themes/linux/social/services-16.png
+++ /dev/null
diff --git a/browser/themes/linux/social/services-64.png b/browser/themes/linux/social/services-64.png
deleted file mode 100644
index e787bddc3..000000000
--- a/browser/themes/linux/social/services-64.png
+++ /dev/null
diff --git a/browser/themes/linux/social/share-button-active.png b/browser/themes/linux/social/share-button-active.png
deleted file mode 100644
index 7df438db0..000000000
--- a/browser/themes/linux/social/share-button-active.png
+++ /dev/null
diff --git a/browser/themes/linux/social/share-button.png b/browser/themes/linux/social/share-button.png
deleted file mode 100644
index c5298c143..000000000
--- a/browser/themes/linux/social/share-button.png
+++ /dev/null
diff --git a/browser/themes/osx/social/services-16.png b/browser/themes/osx/social/services-16.png
deleted file mode 100644
index 7001ea1f0..000000000
--- a/browser/themes/osx/social/services-16.png
+++ /dev/null
diff --git a/browser/themes/osx/social/services-16@2x.png b/browser/themes/osx/social/services-16@2x.png
deleted file mode 100644
index 019110ce2..000000000
--- a/browser/themes/osx/social/services-16@2x.png
+++ /dev/null
diff --git a/browser/themes/osx/social/services-64.png b/browser/themes/osx/social/services-64.png
deleted file mode 100644
index e787bddc3..000000000
--- a/browser/themes/osx/social/services-64.png
+++ /dev/null
diff --git a/browser/themes/osx/social/services-64@2x.png b/browser/themes/osx/social/services-64@2x.png
deleted file mode 100644
index e252b80bc..000000000
--- a/browser/themes/osx/social/services-64@2x.png
+++ /dev/null
diff --git a/browser/themes/windows/social/services-16.png b/browser/themes/windows/social/services-16.png
deleted file mode 100644
index a5f40b21d..000000000
--- a/browser/themes/windows/social/services-16.png
+++ /dev/null
diff --git a/browser/themes/windows/social/services-64.png b/browser/themes/windows/social/services-64.png
deleted file mode 100644
index c42c27826..000000000
--- a/browser/themes/windows/social/services-64.png
+++ /dev/null