From af5c9c32131cce700bb12735a18a2b180146a7c6 Mon Sep 17 00:00:00 2001
From: Justin Dolske <dolske@mozilla.com>
Date: Fri, 27 Jul 2012 23:25:11 -0700
Subject: [PATCH] Bug 769960 - Refactor the terrifying code in
 nsSafebrowsingApplication.js.  r=fryn, f=gcp

---
 browser/app/profile/firefox.js                |   3 +
 .../content/browser-safebrowsing.js}          |  33 +--
 browser/base/content/browser.js               |  17 +-
 browser/base/content/browser.xul              |   3 -
 browser/base/content/utilityOverlay.js        |   7 +-
 browser/components/safebrowsing/Makefile.in   |   8 +-
 .../components/safebrowsing/SafeBrowsing.jsm  | 216 ++++++++++++++++++
 .../safebrowsing/content/application.js       | 108 ---------
 .../safebrowsing/content/globalstore.js       | 191 ----------------
 .../safebrowsing/content/list-warden.js       | 102 ---------
 .../safebrowsing/content/malware-warden.js    | 123 ----------
 .../safebrowsing/content/phishing-warden.js   | 131 -----------
 .../content/report-phishing-overlay.xul       |   4 +-
 browser/components/safebrowsing/jar.mn        |   1 -
 .../src/nsSafebrowsingApplication.js          |  60 -----
 .../src/nsSafebrowsingApplication.manifest    |   2 -
 browser/installer/package-manifest.in         |   4 -
 17 files changed, 248 insertions(+), 765 deletions(-)
 rename browser/{components/safebrowsing/content/sb-loader.js => base/content/browser-safebrowsing.js} (67%)
 create mode 100644 browser/components/safebrowsing/SafeBrowsing.jsm
 delete mode 100644 browser/components/safebrowsing/content/application.js
 delete mode 100644 browser/components/safebrowsing/content/globalstore.js
 delete mode 100644 browser/components/safebrowsing/content/list-warden.js
 delete mode 100644 browser/components/safebrowsing/content/malware-warden.js
 delete mode 100644 browser/components/safebrowsing/content/phishing-warden.js
 delete mode 100644 browser/components/safebrowsing/src/nsSafebrowsingApplication.js
 delete mode 100644 browser/components/safebrowsing/src/nsSafebrowsingApplication.manifest

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 0d9772a508b..17ee5ee76c2 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -721,6 +721,9 @@ pref("browser.safebrowsing.enabled", true);
 // Prevent loading of pages identified as malware
 pref("browser.safebrowsing.malware.enabled", true);
 
+// Debug logging to error console
+pref("browser.safebrowsing.debug", false);
+
 // Non-enhanced mode (local url lists) URL list to check for updates
 pref("browser.safebrowsing.provider.0.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client={moz:client}&appver={moz:version}&pver=2.2");
 
diff --git a/browser/components/safebrowsing/content/sb-loader.js b/browser/base/content/browser-safebrowsing.js
similarity index 67%
rename from browser/components/safebrowsing/content/sb-loader.js
rename to browser/base/content/browser-safebrowsing.js
index 966b9484ecb..96cf1f35897 100644
--- a/browser/components/safebrowsing/content/sb-loader.js
+++ b/browser/base/content/browser-safebrowsing.js
@@ -2,23 +2,14 @@
 # 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/.
 
-var safebrowsing = {
-  startup: function() {
-    setTimeout(function() {
-      safebrowsing.deferredStartup();
-    }, 2000);
-    window.removeEventListener("load", safebrowsing.startup, false);
-  },
-
-  deferredStartup: function() {
-    this.appContext.initialize();
-  },
+#ifdef MOZ_SAFE_BROWSING
+var gSafeBrowsing = {
 
   setReportPhishingMenu: function() {
-      
+
     // A phishing page will have a specific about:blocked content documentURI
     var isPhishingPage = /^about:blocked\?e=phishingBlocked/.test(content.document.documentURI);
-    
+
     // Show/hide the appropriate menu item.
     document.getElementById("menu_HelpPopup_reportPhishingtoolmenu")
             .hidden = isPhishingPage;
@@ -39,15 +30,6 @@ var safebrowsing = {
     else
       broadcaster.setAttribute("disabled", true);
   },
-  
-  /**
-   * Lazy init getter for appContext
-   */
-  get appContext() {
-    delete this.appContext;
-    return this.appContext = Cc["@mozilla.org/safebrowsing/application;1"]
-                            .getService().wrappedJSObject;
-  },
 
   /**
    * Used to report a phishing page or a false positive
@@ -55,13 +37,12 @@ var safebrowsing = {
    * @return String the report phishing URL.
    */
   getReportURL: function(name) {
-    var reportUrl = this.appContext.getReportURL(name);
+    var reportUrl = SafeBrowsing.getReportURL(name);
 
-    var pageUrl = getBrowser().currentURI.asciiSpec;
+    var pageUrl = gBrowser.currentURI.asciiSpec;
     reportUrl += "&url=" + encodeURIComponent(pageUrl);
 
     return reportUrl;
   }
 }
-
-window.addEventListener("load", safebrowsing.startup, false);
+#endif
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 1966dbed7d7..4b9454bd8ce 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -140,6 +140,14 @@ XPCOMUtils.defineLazyGetter(this, "Social", function() {
   return tmp.Social;
 });
 
+#ifdef MOZ_SAFE_BROWSING
+XPCOMUtils.defineLazyGetter(this, "SafeBrowsing", function() {
+  let tmp = {};
+  Cu.import("resource://gre/modules/SafeBrowsing.jsm", tmp);
+  return tmp.SafeBrowsing;
+});
+#endif
+
 let gInitialPages = [
   "about:blank",
   "about:newtab",
@@ -154,6 +162,7 @@ let gInitialPages = [
 #include browser-fullZoom.js
 #include browser-places.js
 #include browser-plugins.js
+#include browser-safebrowsing.js
 #include browser-social.js
 #include browser-tabPreviews.js
 #include browser-tabview.js
@@ -1241,6 +1250,10 @@ var gBrowserInit = {
     TelemetryTimestamps.add("delayedStartupStarted");
     gDelayedStartupTimeoutId = null;
 
+#ifdef MOZ_SAFE_BROWSING
+    SafeBrowsing.init();
+#endif
+
     Services.obs.addObserver(gSessionHistoryObserver, "browser:purge-session-history", false);
     Services.obs.addObserver(gXPInstallObserver, "addon-install-disabled", false);
     Services.obs.addObserver(gXPInstallObserver, "addon-install-started", false);
@@ -2580,7 +2593,7 @@ function BrowserOnClick(event) {
             label: gNavigatorBundle.getString("safebrowsing.notAnAttackButton.label"),
             accessKey: gNavigatorBundle.getString("safebrowsing.notAnAttackButton.accessKey"),
             callback: function() {
-              openUILinkIn(safebrowsing.getReportURL('MalwareError'), 'tab');
+              openUILinkIn(gSafeBrowsing.getReportURL('MalwareError'), 'tab');
             }
           };
         } else {
@@ -2589,7 +2602,7 @@ function BrowserOnClick(event) {
             label: gNavigatorBundle.getString("safebrowsing.notAForgeryButton.label"),
             accessKey: gNavigatorBundle.getString("safebrowsing.notAForgeryButton.accessKey"),
             callback: function() {
-              openUILinkIn(safebrowsing.getReportURL('Error'), 'tab');
+              openUILinkIn(gSafeBrowsing.getReportURL('Error'), 'tab');
             }
           };
         }
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 7992353d303..cabd330e9dd 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -55,9 +55,6 @@
 #include global-scripts.inc
 <script type="application/javascript" src="chrome://browser/content/nsContextMenu.js"/>
 
-#ifdef MOZ_SAFE_BROWSING
-<script type="application/javascript" src="chrome://browser/content/safebrowsing/sb-loader.js"/>
-#endif
 <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
 
 <script type="application/javascript" src="chrome://browser/content/places/editBookmarkOverlay.js"/>
diff --git a/browser/base/content/utilityOverlay.js b/browser/base/content/utilityOverlay.js
index 77523cc0389..cfb313a4cb4 100644
--- a/browser/base/content/utilityOverlay.js
+++ b/browser/base/content/utilityOverlay.js
@@ -524,10 +524,9 @@ function openFeedbackPage()
 
 function buildHelpMenu()
 {
-  // Enable/disable the "Report Web Forgery" menu item.  safebrowsing object
-  // may not exist in OSX
-  if (typeof safebrowsing != "undefined")
-    safebrowsing.setReportPhishingMenu();
+  // Enable/disable the "Report Web Forgery" menu item.
+  if (typeof gSafeBrowsing != "undefined")
+    gSafeBrowsing.setReportPhishingMenu();
 }
 
 function isElementVisible(aElement)
diff --git a/browser/components/safebrowsing/Makefile.in b/browser/components/safebrowsing/Makefile.in
index 6c7961da173..9bb8b3ff56b 100644
--- a/browser/components/safebrowsing/Makefile.in
+++ b/browser/components/safebrowsing/Makefile.in
@@ -17,12 +17,8 @@ ifdef MOZILLA_OFFICIAL
 DEFINES += -DOFFICIAL_BUILD=1
 endif
 
-EXTRA_COMPONENTS = \
-  src/nsSafebrowsingApplication.manifest \
+EXTRA_PP_JS_MODULES = \
+  SafeBrowsing.jsm \
   $(NULL)
 
-EXTRA_PP_COMPONENTS = \
-         src/nsSafebrowsingApplication.js \
-         $(NULL)
-
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/safebrowsing/SafeBrowsing.jsm b/browser/components/safebrowsing/SafeBrowsing.jsm
new file mode 100644
index 00000000000..f2dc3f7a8aa
--- /dev/null
+++ b/browser/components/safebrowsing/SafeBrowsing.jsm
@@ -0,0 +1,216 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+
+var EXPORTED_SYMBOLS = ["SafeBrowsing"];
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+
+Cu.import("resource://gre/modules/Services.jsm");
+
+const phishingList = "goog-phish-shavar";
+const malwareList  = "goog-malware-shavar";
+
+var debug = false;
+function log(...stuff) {
+  if (!debug)
+    return;
+
+  let msg = "SafeBrowsing: " + stuff.join(" ");
+  Services.console.logStringMessage(msg);
+  dump(msg + "\n");
+}
+
+var SafeBrowsing = {
+
+  init: function() {
+    if (this.initialized) {
+      log("Already initialized");
+      return;
+    }
+
+    Services.prefs.addObserver("browser.safebrowsing", this.readPrefs, false);
+    this.readPrefs();
+
+    this.initProviderURLs();
+
+    // Initialize the list manager
+    let listManager = Cc["@mozilla.org/url-classifier/listmanager;1"].
+                      getService(Ci.nsIUrlListManager);
+
+    listManager.setUpdateUrl(this.updateURL);
+    // setKeyUrl has the side effect of fetching a key from the server.
+    // This shouldn't happen if anti-phishing/anti-malware is disabled.
+    if (this.phishingEnabled || this.malwareEnabled)
+      listManager.setKeyUrl(this.keyURL);
+    listManager.setGethashUrl(this.gethashURL);
+
+    // Register our two types of tables
+    listManager.registerTable(phishingList, false);
+    listManager.registerTable(malwareList, false);
+    this.addMozEntries();
+
+    this.controlUpdateChecking();
+    this.initialized = true;
+
+    log("init() finished");
+  },
+
+
+  initialized:     false,
+  phishingEnabled: false,
+  malwareEnabled:  false,
+
+  provName:              null,
+  updateURL:             null,
+  keyURL:                null,
+  reportURL:             null,
+  gethashURL:            null,
+  reportGenericURL:      null,
+  reportErrorURL:        null,
+  reportPhishURL:        null,
+  reportMalwareURL:      null,
+  reportMalwareErrorURL: null,
+
+
+  getReportURL: function(kind) {
+    return this["report"  + kind + "URL"];
+  },
+
+
+  readPrefs: function() {
+    log("reading prefs");
+
+    debug = Services.prefs.getBoolPref("browser.safebrowsing.debug");
+    this.phishingEnabled = Services.prefs.getBoolPref("browser.safebrowsing.enabled");
+    this.malwareEnabled  = Services.prefs.getBoolPref("browser.safebrowsing.malware.enabled");
+
+    // XXX The listManager backend gets confused if this is called before the
+    // lists are registered. So only call it here when a pref changes, and not
+    // when doing initialization. I expect to refactor this later, so pardon the hack.
+    if (this.initialized)
+      this.controlUpdateChecking();
+  },
+
+
+  initProviderURLs: function() {
+    log("initializing provider URLs");
+
+    // XXX remove this as obsolete?
+    let provID = Services.prefs.getIntPref("browser.safebrowsing.dataProvider");
+    if (provID != 0) {
+      Cu.reportError("unknown safebrowsing provider ID " + provID);
+      return;
+    }
+
+    let basePref = "browser.safebrowsing.provider.0.";
+    this.provName = Services.prefs.getCharPref(basePref + "name");
+
+    // Urls used to get data from a provider
+    this.updateURL  = this.getUrlPref(basePref + "updateURL");
+    this.keyURL     = this.getUrlPref(basePref + "keyURL");
+    this.reportURL  = this.getUrlPref(basePref + "reportURL");
+    this.gethashURL = this.getUrlPref(basePref + "gethashURL");
+
+    // Urls to HTML report pages
+    this.reportGenericURL      = this.getUrlPref(basePref + "reportGenericURL");
+    this.reportErrorURL        = this.getUrlPref(basePref + "reportErrorURL");
+    this.reportPhishURL        = this.getUrlPref(basePref + "reportPhishURL");
+    this.reportMalwareURL      = this.getUrlPref(basePref + "reportMalwareURL")
+    this.reportMalwareErrorURL = this.getUrlPref(basePref + "reportMalwareErrorURL")
+  },
+
+
+  getUrlPref: function(prefName) {
+    let MOZ_OFFICIAL_BUILD = false;
+#ifdef OFFICIAL_BUILD
+    MOZ_OFFICIAL_BUILD = true;
+#endif
+
+    let url = Services.prefs.getCharPref(prefName);
+
+    let clientName = MOZ_OFFICIAL_BUILD ? "navclient-auto-ffox" : Services.appinfo.name;
+    let clientVersion = Services.appinfo.version;
+
+    // Parameter substitution
+    // XXX: we should instead use nsIURLFormatter here.
+    url = url.replace(/\{moz:locale\}/g,  this.getLocale());
+    url = url.replace(/\{moz:client\}/g,  clientName);
+    url = url.replace(/\{moz:buildid\}/g, Services.appinfo.appBuildID);
+    url = url.replace(/\{moz:version\}/g, clientVersion);
+
+    log(prefName, "is", url);
+    return url;
+  },
+
+
+  getLocale: function() {
+    const localePref = "general.useragent.locale";
+
+    let locale = Services.prefs.getCharPref(localePref);
+    try {
+      // Dumb. This API only works if pref is localized or has a user value.
+      locale = Services.prefs.getComplexValue(localePref, Ci.nsIPrefLocalizedString).data;
+    } catch (e) { }
+
+    return locale;
+  },
+
+
+  controlUpdateChecking: function() {
+    log("phishingEnabled:", this.phishingEnabled, "malwareEnabled:", this.malwareEnabled);
+
+    let listManager = Cc["@mozilla.org/url-classifier/listmanager;1"].
+                      getService(Ci.nsIUrlListManager);
+
+    if (this.phishingEnabled)
+      listManager.enableUpdate(phishingList);
+    else
+      listManager.disableUpdate(phishingList);
+
+    if (this.malwareEnabled)
+      listManager.enableUpdate(malwareList);
+    else
+      listManager.disableUpdate(malwareList);
+  },
+
+
+  addMozEntries: function() {
+    // Add test entries to the DB.
+    // XXX this should really just be done by DB itself for all moz apps.
+    const phishURL   = "mozilla.org/firefox/its-a-trap.html";
+    const malwareURL = "mozilla.org/firefox/its-an-attack.html";
+
+    let update = "n:1000\ni:test-malware-simple\nad:1\n" +
+                 "a:1:32:" + malwareURL.length + "\n" +
+                 malwareURL;
+    update += "n:1000\ni:test-phish-simple\nad:1\n" +
+              "a:1:32:" + phishURL.length + "\n" +
+              phishURL;
+    log("addMozEntries:", update);
+
+    let db = Cc["@mozilla.org/url-classifier/dbservice;1"].
+             getService(Ci.nsIUrlClassifierDBService);
+
+    // nsIUrlClassifierUpdateObserver
+    let dummyListener = {
+      updateUrlRequested: function() { },
+      streamFinished:     function() { },
+      updateError:        function() { },
+      updateSuccess:      function() { }
+    };
+
+    try {
+      db.beginUpdate(dummyListener, "test-malware-simple,test-phish-simple", "");
+      db.beginStream("", "");
+      db.updateStream(update);
+      db.finishStream();
+      db.finishUpdate();
+    } catch(ex) {
+      // beginUpdate will throw harmlessly if there's an existing update in progress, ignore failures.
+      log("addMozEntries failed!", ex);
+    }
+  },
+};
diff --git a/browser/components/safebrowsing/content/application.js b/browser/components/safebrowsing/content/application.js
deleted file mode 100644
index 6e7deaa09ed..00000000000
--- a/browser/components/safebrowsing/content/application.js
+++ /dev/null
@@ -1,108 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-// We instantiate this variable when we create the application.
-var gDataProvider = null;
-
-// An instance of our application is a PROT_Application object. It
-// basically just populates a few globals and instantiates wardens,
-// the listmanager, and the about:blocked error page.
-
-/**
- * An instance of our application. There should be exactly one of these.
- * 
- * Note: This object should instantiated only at profile-after-change
- * or later because the listmanager and the cryptokeymanager need to
- * read and write data files. Additionally, NSS isn't loaded until
- * some time around then (Moz bug #321024).
- *
- * @constructor
- */
-function PROT_Application() {
-  this.debugZone= "application";
-
-#ifdef DEBUG
-  // TODO This is truly lame; we definitely want something better
-  function runUnittests() {
-    if (false) {
-
-      G_DebugL("UNITTESTS", "STARTING UNITTESTS");
-      TEST_G_Protocol4Parser();
-      TEST_G_CryptoHasher();
-      TEST_PROT_EnchashDecrypter();
-      TEST_PROT_TRTable();
-      TEST_PROT_ListManager();
-      TEST_PROT_PhishingWarden();
-      TEST_PROT_TRFetcher();
-      TEST_PROT_URLCanonicalizer();
-      TEST_G_Preferences();
-      TEST_G_Observer();
-      TEST_PROT_WireFormat();
-      // UrlCrypto's test should come before the key manager's
-      TEST_PROT_UrlCrypto();
-      TEST_PROT_UrlCryptoKeyManager();
-      G_DebugL("UNITTESTS", "END UNITTESTS");
-    }
-  };
-
-  runUnittests();
-#endif
-  
-  // expose some classes
-  this.PROT_PhishingWarden = PROT_PhishingWarden;
-  this.PROT_MalwareWarden = PROT_MalwareWarden;
-
-  // Load data provider pref values
-  gDataProvider = new PROT_DataProvider();
-
-  // expose the object
-  this.wrappedJSObject = this;
-}
-
-var gInitialized = false;
-PROT_Application.prototype.initialize = function() {
-  if (gInitialized)
-    return;
-  gInitialized = true;
-
-  var obs = Cc["@mozilla.org/observer-service;1"].
-            getService(Ci.nsIObserverService);
-  obs.addObserver(this, "xpcom-shutdown", true);
-
-  // XXX: move table names to a pref that we originally will download
-  // from the provider (need to workout protocol details)
-  this.malwareWarden = new PROT_MalwareWarden();
-  this.malwareWarden.registerBlackTable("goog-malware-shavar");
-  this.malwareWarden.maybeToggleUpdateChecking();
-
-  this.phishWarden = new PROT_PhishingWarden();
-  this.phishWarden.registerBlackTable("goog-phish-shavar");
-  this.phishWarden.maybeToggleUpdateChecking();
-}
-
-PROT_Application.prototype.observe = function(subject, topic, data) {
-  switch (topic) {
-    case "xpcom-shutdown":
-      this.malwareWarden.shutdown();
-      this.phishWarden.shutdown();
-      break;
-  }
-}
-
-/**
- * @param name String The type of url to get (either Phish or Error).
- * @return String the report phishing URL (localized).
- */
-PROT_Application.prototype.getReportURL = function(name) {
-  return gDataProvider["getReport" + name + "URL"]();
-}
-
-PROT_Application.prototype.QueryInterface = function(iid) {
-  if (iid.equals(Ci.nsISupports) ||
-      iid.equals(Ci.nsISupportsWeakReference) ||
-      iid.equals(Ci.nsIObserver))
-    return this;
-
-  throw Components.results.NS_ERROR_NO_INTERFACE;
-}
diff --git a/browser/components/safebrowsing/content/globalstore.js b/browser/components/safebrowsing/content/globalstore.js
deleted file mode 100644
index 2f85e56cae8..00000000000
--- a/browser/components/safebrowsing/content/globalstore.js
+++ /dev/null
@@ -1,191 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-
-// A class that encapsulates data provider specific values.  The
-// root of the provider pref tree is browser.safebrowsing.provider.
-// followed by a number, followed by specific properties.  The properties
-// that a data provider can supply are:
-//
-// name: The name of the provider
-// keyURL: Before we send URLs in enhanced mode, we need to encrypt them
-// reportURL: When shown a warning bubble, we send back the user decision
-//            (get me out of here/ignore warning) to this URL (strip cookies
-//            first).  This is optional.
-// gethashURL: Url for requesting complete hashes from the provider.
-// reportGenericURL: HTML page for general user feedback
-// reportPhishURL: HTML page for notifying the provider of a new phishing page
-// reportErrorURL: HTML page for notifying the provider of a false positive
-
-const kDataProviderIdPref = 'browser.safebrowsing.dataProvider';
-const kProviderBasePref = 'browser.safebrowsing.provider.';
-
-#ifdef OFFICIAL_BUILD
-const MOZ_OFFICIAL_BUILD = true;
-#else
-const MOZ_OFFICIAL_BUILD = false;
-#endif
-
-const MOZ_PARAM_LOCALE = /\{moz:locale\}/g;
-const MOZ_PARAM_CLIENT = /\{moz:client\}/g;
-const MOZ_PARAM_BUILDID = /\{moz:buildid\}/g;
-const MOZ_PARAM_VERSION = /\{moz:version\}/g;
-
-/**
- * Information regarding the data provider.
- */
-function PROT_DataProvider() {
-  this.prefs_ = new G_Preferences();
-
-  this.loadDataProviderPrefs_();
-  
-  // Watch for changes in the data provider and update accordingly.
-  this.prefs_.addObserver(kDataProviderIdPref,
-                          BindToObject(this.loadDataProviderPrefs_, this));
-
-  // Watch for when anti-phishing is toggled on or off.
-  this.prefs_.addObserver(kPhishWardenEnabledPref,
-                          BindToObject(this.loadDataProviderPrefs_, this));
-}
-
-/**
- * Populate all the provider variables.  We also call this when whenever
- * the provider id changes.
- */
-PROT_DataProvider.prototype.loadDataProviderPrefs_ = function() {
-  // Currently, there's no UI for changing local list provider so we
-  // hard code the value for provider 0.
-  this.updateURL_ = this.getUrlPref_(
-        'browser.safebrowsing.provider.0.updateURL');
-
-  var id = this.prefs_.getPref(kDataProviderIdPref, null);
-
-  // default to 0
-  if (null == id)
-    id = 0;
-  
-  var basePref = kProviderBasePref + id + '.';
-
-  this.name_ = this.prefs_.getPref(basePref + "name", "");
-
-  // Urls used to get data from a provider
-  this.keyURL_ = this.getUrlPref_(basePref + "keyURL");
-  this.reportURL_ = this.getUrlPref_(basePref + "reportURL");
-  this.gethashURL_ = this.getUrlPref_(basePref + "gethashURL");
-
-  // Urls to HTML report pages
-  this.reportGenericURL_ = this.getUrlPref_(basePref + "reportGenericURL");
-  this.reportErrorURL_ = this.getUrlPref_(basePref + "reportErrorURL");
-  this.reportPhishURL_ = this.getUrlPref_(basePref + "reportPhishURL");
-  this.reportMalwareURL_ = this.getUrlPref_(basePref + "reportMalwareURL")
-  this.reportMalwareErrorURL_ = this.getUrlPref_(basePref + "reportMalwareErrorURL")
-
-  // Propagate the changes to the list-manager.
-  this.updateListManager_();
-}
-
-/**
- * The list manager needs urls to operate.  It needs a url to know where the
- * table updates are, and it needs a url for decrypting enchash style tables.
- */
-PROT_DataProvider.prototype.updateListManager_ = function() {
-  var listManager = Cc["@mozilla.org/url-classifier/listmanager;1"]
-                      .getService(Ci.nsIUrlListManager);
-
-  // If we add support for changing local data providers, we need to add a
-  // pref observer that sets the update url accordingly.
-  listManager.setUpdateUrl(this.getUpdateURL());
-
-  // setKeyUrl has the side effect of fetching a key from the server.
-  // This shouldn't happen if anti-phishing/anti-malware is disabled.
-  var isEnabled = this.prefs_.getPref(kPhishWardenEnabledPref, false) ||
-                  this.prefs_.getPref(kMalwareWardenEnabledPref, false);
-  if (isEnabled) {
-    listManager.setKeyUrl(this.keyURL_);
-  }
-
-  listManager.setGethashUrl(this.getGethashURL());
-}
-
-/**
- * Lookup the value of a URL from prefs file and do parameter substitution.
- */
-PROT_DataProvider.prototype.getUrlPref_ = function(prefName) {
-  var url = this.prefs_.getPref(prefName);
-
-  var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
-                          .getService(Components.interfaces.nsIXULAppInfo);
-
-  var mozClientStr = this.prefs_.getPref("browser.safebrowsing.clientid",
-                                         MOZ_OFFICIAL_BUILD ? 'navclient-auto-ffox' : appInfo.name);
-
-  var versionStr = this.prefs_.getPref("browser.safebrowsing.clientver",
-                                       appInfo.version);
-
-  // Parameter substitution
-  url = url.replace(MOZ_PARAM_LOCALE, this.getLocale_());
-  url = url.replace(MOZ_PARAM_CLIENT, mozClientStr);
-  url = url.replace(MOZ_PARAM_BUILDID, appInfo.appBuildID);
-  url = url.replace(MOZ_PARAM_VERSION, versionStr);
-  return url;
-}
-
-/**
- * @return String the browser locale (similar code is in nsSearchService.js)
- */
-PROT_DataProvider.prototype.getLocale_ = function() {
-  const localePref = "general.useragent.locale";
-  var locale = this.getLocalizedPref_(localePref);
-  if (locale)
-    return locale;
-
-  // Not localized
-  var prefs = new G_Preferences();
-  return prefs.getPref(localePref, "");
-}
-
-/**
- * @return String name of the localized pref, null if none exists.
- */
-PROT_DataProvider.prototype.getLocalizedPref_ = function(aPrefName) {
-  // G_Preferences doesn't know about complex values, so we use the
-  // xpcom object directly.
-  var prefs = Cc["@mozilla.org/preferences-service;1"]
-              .getService(Ci.nsIPrefBranch);
-  try {
-    return prefs.getComplexValue(aPrefName, Ci.nsIPrefLocalizedString).data;
-  } catch (ex) {
-  }
-  return "";
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// Getters for the remote provider pref values mentioned above.
-PROT_DataProvider.prototype.getName = function() {
-  return this.name_;
-}
-
-PROT_DataProvider.prototype.getUpdateURL = function() {
-  return this.updateURL_;
-}
-
-PROT_DataProvider.prototype.getGethashURL = function() {
-  return this.gethashURL_;
-}
-
-PROT_DataProvider.prototype.getReportGenericURL = function() {
-  return this.reportGenericURL_;
-}
-PROT_DataProvider.prototype.getReportErrorURL = function() {
-  return this.reportErrorURL_;
-}
-PROT_DataProvider.prototype.getReportPhishURL = function() {
-  return this.reportPhishURL_;
-}
-PROT_DataProvider.prototype.getReportMalwareURL = function() {
-  return this.reportMalwareURL_;
-}
-PROT_DataProvider.prototype.getReportMalwareErrorURL = function() {
-  return this.reportMalwareErrorURL_;
-}
diff --git a/browser/components/safebrowsing/content/list-warden.js b/browser/components/safebrowsing/content/list-warden.js
deleted file mode 100644
index d2a1b6c53e0..00000000000
--- a/browser/components/safebrowsing/content/list-warden.js
+++ /dev/null
@@ -1,102 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-// A warden that knows how to register lists with a listmanager and keep them
-// updated if necessary.  The ListWarden also provides a simple interface to
-// check if a URL is evil or not.  Specialized wardens like the PhishingWarden
-// inherit from it.
-//
-// Classes that inherit from ListWarden are responsible for calling
-// enableTableUpdates or disableTableUpdates.  This usually entails
-// registering prefObservers and calling enable or disable in the base
-// class as appropriate.
-//
-
-/**
- * Abtracts the checking of user/browser actions for signs of
- * phishing. 
- *
- * @constructor
- */
-function PROT_ListWarden() {
-  this.debugZone = "listwarden";
-  var listManager = Cc["@mozilla.org/url-classifier/listmanager;1"]
-                      .getService(Ci.nsIUrlListManager);
-  this.listManager_ = listManager;
-
-  // Once we register tables, their respective names will be listed here.
-  this.blackTables_ = [];
-  this.whiteTables_ = [];
-}
-
-PROT_ListWarden.IN_BLACKLIST = 0
-PROT_ListWarden.IN_WHITELIST = 1
-PROT_ListWarden.NOT_FOUND = 2
-
-/**
- * Tell the ListManger to keep all of our tables updated
- */
-
-PROT_ListWarden.prototype.enableBlacklistTableUpdates = function() {
-  for (var i = 0; i < this.blackTables_.length; ++i) {
-    this.listManager_.enableUpdate(this.blackTables_[i]);
-  }
-}
-
-/**
- * Tell the ListManager to stop updating our tables
- */
-
-PROT_ListWarden.prototype.disableBlacklistTableUpdates = function() {
-  for (var i = 0; i < this.blackTables_.length; ++i) {
-    this.listManager_.disableUpdate(this.blackTables_[i]);
-  }
-}
-
-/**
- * Tell the ListManager to update whitelist tables.  They may be enabled even
- * when other updates aren't, for performance reasons.
- */
-PROT_ListWarden.prototype.enableWhitelistTableUpdates = function() {
-  for (var i = 0; i < this.whiteTables_.length; ++i) {
-    this.listManager_.enableUpdate(this.whiteTables_[i]);
-  }
-}
-
-/**
- * Tell the ListManager to stop updating whitelist tables.
- */
-PROT_ListWarden.prototype.disableWhitelistTableUpdates = function() {
-  for (var i = 0; i < this.whiteTables_.length; ++i) {
-    this.listManager_.disableUpdate(this.whiteTables_[i]);
-  }
-}
-
-/**
- * Register a new black list table with the list manager
- * @param tableName - name of the table to register
- * @returns true if the table could be registered, false otherwise
- */
-
-PROT_ListWarden.prototype.registerBlackTable = function(tableName) {
-  var result = this.listManager_.registerTable(tableName, false);
-  if (result) {
-    this.blackTables_.push(tableName);
-  }
-  return result;
-}
-
-/**
- * Register a new white list table with the list manager
- * @param tableName - name of the table to register
- * @returns true if the table could be registered, false otherwise
- */
-
-PROT_ListWarden.prototype.registerWhiteTable = function(tableName) {
-  var result = this.listManager_.registerTable(tableName, false);
-  if (result) {
-    this.whiteTables_.push(tableName);
-  }
-  return result;
-}
diff --git a/browser/components/safebrowsing/content/malware-warden.js b/browser/components/safebrowsing/content/malware-warden.js
deleted file mode 100644
index 6246d49d80e..00000000000
--- a/browser/components/safebrowsing/content/malware-warden.js
+++ /dev/null
@@ -1,123 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-// This warden manages updates to the malware list
-
-const kMalwareWardenEnabledPref = "browser.safebrowsing.malware.enabled";
-
-function PROT_MalwareWarden() {
-  PROT_ListWarden.call(this);
-
-  this.debugZone = "malwarewarden";
-
-  // Use this to query preferences
-  this.prefs_ = new G_Preferences();
-
-  // Global preference to enable the malware warden
-  this.malwareWardenEnabled_ =
-    this.prefs_.getPref(kMalwareWardenEnabledPref, null);
-
-  // Get notifications when the malware warden enabled pref changes
-  var malwareWardenPrefObserver =
-    BindToObject(this.onMalwareWardenEnabledPrefChanged, this);
-  this.prefs_.addObserver(kMalwareWardenEnabledPref, malwareWardenPrefObserver);
-
-  // Add a test chunk to the database
-  var testData = "mozilla.org/firefox/its-an-attack.html";
-
-  var testUpdate =
-    "n:1000\ni:test-malware-simple\nad:1\n" +
-    "a:1:32:" + testData.length + "\n" +
-    testData;
-    
-  testData = "mozilla.org/firefox/its-a-trap.html";
-  testUpdate +=
-    "n:1000\ni:test-phish-simple\nad:1\n" +
-    "a:1:32:" + testData.length + "\n" +
-    testData;
-
-  var dbService_ = Cc["@mozilla.org/url-classifier/dbservice;1"]
-                   .getService(Ci.nsIUrlClassifierDBService);
-
-  var listener = {
-    QueryInterface: function(iid)
-    {
-      if (iid.equals(Ci.nsISupports) ||
-          iid.equals(Ci.nsIUrlClassifierUpdateObserver))
-        return this;
-      throw Cr.NS_ERROR_NO_INTERFACE;
-    },
-
-    updateUrlRequested: function(url) { },
-    streamFinished: function(status) { },
-    updateError: function(errorCode) { },
-    updateSuccess: function(requestedTimeout) { }
-  };
-
-  try {
-    dbService_.beginUpdate(listener,
-                           "test-malware-simple,test-phish-simple", "");
-    dbService_.beginStream("", "");
-    dbService_.updateStream(testUpdate);
-    dbService_.finishStream();
-    dbService_.finishUpdate();
-  } catch(ex) {
-    // beginUpdate will throw harmlessly if there's an existing update
-    // in progress, ignore failures.
-  }
-  G_Debug(this, "malwareWarden initialized");
-}
-
-PROT_MalwareWarden.inherits(PROT_ListWarden);
-
-/**
- * Cleanup on shutdown.
- */
-PROT_MalwareWarden.prototype.shutdown = function() {
-  this.prefs_.removeAllObservers();
-
-  this.listManager_ = null;
-}
-
-/**
- * When a preference changes, we might have to start or stop asking for
- * updates.
- */
-PROT_MalwareWarden.prototype.maybeToggleUpdateChecking = function() {
-  var malwareWardenEnabled = this.prefs_.getPref(kMalwareWardenEnabledPref,
-                                                 null);
-
-  G_Debug(this, "Maybe toggling update checking. " +
-          "Warden enabled? " + malwareWardenEnabled);
-
-  // Do nothing unless thre pref is set
-  if (malwareWardenEnabled === null)
-    return;
-
-  // We update and save to disk all tables
-  if (malwareWardenEnabled === true) {
-    this.enableBlacklistTableUpdates();
-  } else {
-    // Anti-malware is off, disable table updates
-    this.disableBlacklistTableUpdates();
-  }
-}
-
-/**
- * Deal with a user changing the pref that says whether we should 
- * enable the malware warden.
- *
- * @param prefName Name of the pref holding the value indicating whether
- *                 we should enable the malware warden
- */
-PROT_MalwareWarden.prototype.onMalwareWardenEnabledPrefChanged = function(
-                                                                    prefName) {
-  // Just to be safe, ignore changes to sub prefs.
-  if (prefName != kMalwareWardenEnabledPref)
-    return;
-
-  this.malwareWardenEnabled_ =
-    this.prefs_.getPref(prefName, this.malwareWardenEnabled_);
-  this.maybeToggleUpdateChecking();
-}
diff --git a/browser/components/safebrowsing/content/phishing-warden.js b/browser/components/safebrowsing/content/phishing-warden.js
deleted file mode 100644
index 87b3cbc30c9..00000000000
--- a/browser/components/safebrowsing/content/phishing-warden.js
+++ /dev/null
@@ -1,131 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-
-// The warden checks request to see if they are for phishy pages. It
-// does so by querying our locally stored blacklists.
-// 
-// When the warden notices a problem, it queries all browser views
-// (each of which corresopnds to an open browser window) to see
-// whether one of them can handle it. A browser view can handle a
-// problem if its browser window has an HTMLDocument loaded with the
-// given URL and that Document hasn't already been flagged as a
-// problem. For every problematic URL we notice loading, at most one
-// Document is flagged as problematic. Otherwise you can get into
-// trouble if multiple concurrent phishy pages load with the same URL.
-//
-// Since we check URLs very early in the request cycle (in a progress
-// listener), the URL might not yet be associated with a Document when
-// we determine that it is phishy. So the the warden retries finding
-// a browser view to handle the problem until one can, or until it
-// determines it should give up (see complicated logic below).
-//
-// The warden has displayers that the browser view uses to render
-// different kinds of warnings (e.g., one that's shown before a page
-// loads as opposed to one that's shown after the page has already
-// loaded).
-//
-// Note: There is a single warden for the whole application.
-//
-// TODO better way to expose displayers/views to browser view
-
-const kPhishWardenEnabledPref = "browser.safebrowsing.enabled";
-
-/**
- * Abtracts the checking of user/browser actions for signs of
- * phishing. 
- *
- * @param progressListener nsIDocNavStartProgressListener
- * @param tabbrowser XUL tabbrowser element
- * @constructor
- */
-function PROT_PhishingWarden() {
-  PROT_ListWarden.call(this);
-
-  this.debugZone = "phishwarden";
-
-  // Use this to query preferences
-  this.prefs_ = new G_Preferences();
-
-  // We need to know whether we're enabled and whether we're in advanced
-  // mode, so reflect the appropriate preferences into our state.
-
-  // Global preference to enable the phishing warden
-  this.phishWardenEnabled_ = this.prefs_.getPref(kPhishWardenEnabledPref, null);
-
-  // Get notifications when the phishing warden enabled pref changes
-  var phishWardenPrefObserver = 
-    BindToObject(this.onPhishWardenEnabledPrefChanged, this);
-  this.prefs_.addObserver(kPhishWardenEnabledPref, phishWardenPrefObserver);
-
-  G_Debug(this, "phishWarden initialized");
-}
-
-PROT_PhishingWarden.inherits(PROT_ListWarden);
-
-PROT_PhishingWarden.prototype.QueryInterface = function(iid) {
-  if (iid.equals(Ci.nsISupports) || 
-      iid.equals(Ci.nsISupportsWeakReference))
-    return this;
-  throw Components.results.NS_ERROR_NO_INTERFACE;
-}
-
-/**
- * Cleanup on shutdown.
- */
-PROT_PhishingWarden.prototype.shutdown = function() {
-  this.prefs_.removeAllObservers();
-  this.listManager_ = null;
-}
-
-/**
- * When a preference (either advanced features or the phishwarden
- * enabled) changes, we might have to start or stop asking for updates. 
- * 
- * This is a little tricky; we start or stop management only when we
- * have complete information we can use to determine whether we
- * should.  It could be the case that one pref or the other isn't set
- * yet (e.g., they haven't opted in/out of advanced features). So do
- * nothing unless we have both pref values -- we get notifications for
- * both, so eventually we will start correctly.
- */ 
-PROT_PhishingWarden.prototype.maybeToggleUpdateChecking = function() {
-  var phishWardenEnabled = this.prefs_.getPref(kPhishWardenEnabledPref, null);
-
-  G_Debug(this, "Maybe toggling update checking. " +
-          "Warden enabled? " + phishWardenEnabled);
-
-  // Do nothing unless both prefs are set.  They can be null (unset), true, or
-  // false.
-  if (phishWardenEnabled === null)
-    return;
-
-  // We update and save to disk all tables
-  if (phishWardenEnabled === true) {
-    this.enableBlacklistTableUpdates();
-    this.enableWhitelistTableUpdates();
-  } else {
-    // Anti-phishing is off, disable table updates
-    this.disableBlacklistTableUpdates();
-    this.disableWhitelistTableUpdates();
-  }
-}
-
-/**
- * Deal with a user changing the pref that says whether we should 
- * enable the phishing warden (i.e., that SafeBrowsing is active)
- *
- * @param prefName Name of the pref holding the value indicating whether
- *                 we should enable the phishing warden
- */
-PROT_PhishingWarden.prototype.onPhishWardenEnabledPrefChanged = function(
-                                                                    prefName) {
-  // Just to be safe, ignore changes to sub prefs.
-  if (prefName != "browser.safebrowsing.enabled")
-    return;
-
-  this.phishWardenEnabled_ = 
-    this.prefs_.getPref(prefName, this.phishWardenEnabled_);
-  this.maybeToggleUpdateChecking();
-}
diff --git a/browser/components/safebrowsing/content/report-phishing-overlay.xul b/browser/components/safebrowsing/content/report-phishing-overlay.xul
index d2e106de68b..7479b816165 100644
--- a/browser/components/safebrowsing/content/report-phishing-overlay.xul
+++ b/browser/components/safebrowsing/content/report-phishing-overlay.xul
@@ -21,14 +21,14 @@
               accesskey="&reportPhishSiteMenu.accesskey;"
               insertbefore="aboutSeparator"
               observes="reportPhishingBroadcaster"
-              oncommand="openUILink(safebrowsing.getReportURL('Phish'), event);"
+              oncommand="openUILink(gSafeBrowsing.getReportURL('Phish'), event);"
               onclick="checkForMiddleClick(this, event);"/>
     <menuitem id="menu_HelpPopup_reportPhishingErrortoolmenu"
               label="&safeb.palm.notforgery.label2;"
               accesskey="&reportPhishSiteMenu.accesskey;"
               insertbefore="aboutSeparator"
               observes="reportPhishingErrorBroadcaster"
-              oncommand="openUILinkIn(safebrowsing.getReportURL('Error'), 'tab');"
+              oncommand="openUILinkIn(gSafeBrowsing.getReportURL('Error'), 'tab');"
               onclick="checkForMiddleClick(this, event);"/>
   </menupopup>
 </overlay>
diff --git a/browser/components/safebrowsing/jar.mn b/browser/components/safebrowsing/jar.mn
index b355ebbd2b6..09b6685cf5d 100644
--- a/browser/components/safebrowsing/jar.mn
+++ b/browser/components/safebrowsing/jar.mn
@@ -3,7 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 browser.jar:
-* content/browser/safebrowsing/sb-loader.js                    (content/sb-loader.js)
 * content/browser/safebrowsing/report-phishing-overlay.xul     (content/report-phishing-overlay.xul)
   content/browser/safebrowsing/blockedSite.xhtml               (content/blockedSite.xhtml)
 % overlay chrome://browser/content/browser.xul         chrome://browser/content/safebrowsing/report-phishing-overlay.xul
diff --git a/browser/components/safebrowsing/src/nsSafebrowsingApplication.js b/browser/components/safebrowsing/src/nsSafebrowsingApplication.js
deleted file mode 100644
index d48f713af5e..00000000000
--- a/browser/components/safebrowsing/src/nsSafebrowsingApplication.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * 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/. */
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-
-// This is copied from toolkit/components/content/js/lang.js.
-// It seems cleaner to copy this rather than #include from so far away.
-Function.prototype.inherits = function(parentCtor) {
-  var tempCtor = function(){};
-  tempCtor.prototype = parentCtor.prototype;
-  this.superClass_ = parentCtor.prototype;
-  this.prototype = new tempCtor();
-}  
-
-#include ../content/application.js
-#include ../content/globalstore.js
-#include ../content/list-warden.js
-#include ../content/phishing-warden.js
-#include ../content/malware-warden.js
-
-var modScope = this;
-function Init() {
-  var jslib = Cc["@mozilla.org/url-classifier/jslib;1"]
-              .getService().wrappedJSObject;
-  modScope.G_Debug = jslib.G_Debug;
-  modScope.G_Assert = jslib.G_Assert;
-  modScope.G_Alarm = jslib.G_Alarm;
-  modScope.G_ConditionalAlarm = jslib.G_ConditionalAlarm;
-  modScope.G_ObserverWrapper = jslib.G_ObserverWrapper;
-  modScope.G_Preferences = jslib.G_Preferences;
-  modScope.PROT_XMLFetcher = jslib.PROT_XMLFetcher;
-  modScope.BindToObject = jslib.BindToObject;
-  modScope.G_Protocol4Parser = jslib.G_Protocol4Parser;
-  modScope.PROT_UrlCrypto = jslib.PROT_UrlCrypto;
-  modScope.RequestBackoff = jslib.RequestBackoff;
-  
-  // We only need to call Init once
-  modScope.Init = function() {};
-}
-
-function SafeBrowsingApplication()
-{
-}
-SafeBrowsingApplication.prototype = {
-  classID: Components.ID("{c64d0bcb-8270-4ca7-a0b3-3380c8ffecb5}"),
-  _xpcom_factory: {
-    createInstance: function(outer, iid) {
-      if (outer != null)
-        throw Components.results.NS_ERROR_NO_AGGREGATION;
-      Init();
-      return new PROT_Application();
-    }
-  },
-};
-
-var NSGetFactory = XPCOMUtils.generateNSGetFactory([SafeBrowsingApplication]);
diff --git a/browser/components/safebrowsing/src/nsSafebrowsingApplication.manifest b/browser/components/safebrowsing/src/nsSafebrowsingApplication.manifest
deleted file mode 100644
index 79493a99fcd..00000000000
--- a/browser/components/safebrowsing/src/nsSafebrowsingApplication.manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-component {c64d0bcb-8270-4ca7-a0b3-3380c8ffecb5} nsSafebrowsingApplication.js
-contract @mozilla.org/safebrowsing/application;1 {c64d0bcb-8270-4ca7-a0b3-3380c8ffecb5}
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index ac9bc42b584..bf417b0ff03 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -493,10 +493,6 @@
 @BINPATH@/modules/*
 
 ; Safe Browsing
-#ifdef MOZ_SAFE_BROWSING
-@BINPATH@/components/nsSafebrowsingApplication.manifest
-@BINPATH@/components/nsSafebrowsingApplication.js
-#endif
 #ifdef MOZ_URL_CLASSIFIER
 @BINPATH@/components/nsURLClassifier.manifest
 @BINPATH@/components/nsUrlClassifierHashCompleter.js