Bug 778608 - Move SafeBrowsing.jsm to toolkit. r=gavin

--HG--
rename : browser/components/safebrowsing/content/blockedSite.xhtml => browser/base/content/blockedSite.xhtml
rename : browser/components/safebrowsing/content/report-phishing-overlay.xul => browser/base/content/report-phishing-overlay.xul
rename : browser/components/safebrowsing/SafeBrowsing.jsm => toolkit/components/url-classifier/SafeBrowsing.jsm

browser/base/jar.mn

@@ -122,3 +122,8 @@ browser.jar:
 # the following files are browser-specific overrides
 *       content/browser/license.html                  (/toolkit/content/license.html)
 % override chrome://global/content/license.html chrome://browser/content/license.html
+#ifdef MOZ_SAFE_BROWSING
+*       content/browser/report-phishing-overlay.xul     (content/report-phishing-overlay.xul)
+        content/browser/blockedSite.xhtml               (content/blockedSite.xhtml)
+% overlay chrome://browser/content/browser.xul chrome://browser/content/report-phishing-overlay.xul
+#endif

browser/components/about/AboutRedirector.cpp

@@ -34,7 +34,7 @@ struct RedirEntry {
  */
 static RedirEntry kRedirMap[] = {
 #ifdef MOZ_SAFE_BROWSING
-  { "blocked", "chrome://browser/content/safebrowsing/blockedSite.xhtml",
+  { "blocked", "chrome://browser/content/blockedSite.xhtml",
     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
     nsIAboutModule::ALLOW_SCRIPT |
     nsIAboutModule::HIDE_FROM_ABOUTABOUT },

browser/components/safebrowsing/Makefile.in

@@ -12,16 +12,4 @@ include $(DEPTH)/config/autoconf.mk
 
 TEST_DIRS += content/test
 
-# Normally the "client ID" sent in updates is appinfo.name, but for
-# official Firefox releases from Mozilla we use a special identifier.
-ifdef MOZILLA_OFFICIAL
-ifdef MOZ_PHOENIX
-DEFINES += -DUSE_HISTORIC_SAFEBROWSING_ID=1
-endif
-endif
-
-EXTRA_PP_JS_MODULES = \
-  SafeBrowsing.jsm \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk

browser/components/safebrowsing/jar.mn

@@ -1,8 +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/.
-
-browser.jar:
-  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

toolkit/components/url-classifier/Makefile.in

@@ -17,6 +17,14 @@ XPIDL_MODULE = url-classifier
 LIBXUL_LIBRARY = 1
 FORCE_STATIC_LIB = 1
 
+# Normally the "client ID" sent in updates is appinfo.name, but for
+# official Firefox releases from Mozilla we use a special identifier.
+ifdef MOZILLA_OFFICIAL
+ifdef MOZ_PHOENIX
+DEFINES += -DUSE_HISTORIC_SAFEBROWSING_ID=1
+endif
+endif
+
 XPIDLSRCS = \
   nsIUrlClassifierDBService.idl \
   nsIUrlClassifierHashCompleter.idl \
@@ -56,6 +64,10 @@ EXTRA_PP_COMPONENTS = \
   nsUrlClassifierListManager.js \
   $(NULL)
 
+EXTRA_PP_JS_MODULES = \
+  SafeBrowsing.jsm \
+  $(NULL)
+
 ifdef ENABLE_TESTS
 TOOL_DIRS += tests
 endif