Kill Google Safebrowsing.

7 files changed, 1 insertions, 70 deletions

diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
index a848fb80b..6b70aea84 100644
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -576,40 +576,6 @@ pref("shumway.disabled", true);
 // enable touch events interfaces
 pref("dom.w3c_touch_events.enabled", 1);
 
-#ifdef MOZ_SAFE_BROWSING
-pref("browser.safebrowsing.enabled", true);
-pref("browser.safebrowsing.malware.enabled", true);
-pref("browser.safebrowsing.debug", false);
-
-pref("browser.safebrowsing.updateURL", "https://safebrowsing.google.com/safebrowsing/downloads?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2&key=%GOOGLE_API_KEY%");
-pref("browser.safebrowsing.gethashURL", "https://safebrowsing.google.com/safebrowsing/gethash?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2");
-pref("browser.safebrowsing.reportURL", "https://safebrowsing.google.com/safebrowsing/report?");
-pref("browser.safebrowsing.reportGenericURL", "http://%LOCALE%.phish-generic.mozilla.com/?hl=%LOCALE%");
-pref("browser.safebrowsing.reportErrorURL", "http://%LOCALE%.phish-error.mozilla.com/?hl=%LOCALE%");
-pref("browser.safebrowsing.reportPhishURL", "http://%LOCALE%.phish-report.mozilla.com/?hl=%LOCALE%");
-pref("browser.safebrowsing.reportMalwareURL", "http://%LOCALE%.malware-report.mozilla.com/?hl=%LOCALE%");
-pref("browser.safebrowsing.reportMalwareErrorURL", "http://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%");
-
-pref("browser.safebrowsing.malware.reportURL", "https://safebrowsing.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site=");
-
-pref("browser.safebrowsing.id", @MOZ_APP_UA_NAME@);
-
-// Name of the about: page contributed by safebrowsing to handle display of error
-// pages on phishing/malware hits.  (bug 399233)
-pref("urlclassifier.alternate_error_page", "blocked");
-
-// The number of random entries to send with a gethash request.
-pref("urlclassifier.gethashnoise", 4);
-
-// Gethash timeout for Safebrowsing.
-pref("urlclassifier.gethash.timeout_ms", 5000);
-
-// If an urlclassifier table has not been updated in this number of seconds,
-// a gethash request will be forced to check that the result is still in
-// the database.
-pref("urlclassifier.max-complete-age", 2700);
-#endif
-
 // URL for posting tiles metrics.
 #ifdef RELEASE_BUILD
 pref("browser.tiles.reportURL", "https://tiles.services.mozilla.com/v2/links/click");
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 70f12b7f3..fdb88062d 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -57,11 +57,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "LoginManagerParent",
 XPCOMUtils.defineLazyModuleGetter(this, "Task", "resource://gre/modules/Task.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm");
 
-if (AppConstants.MOZ_SAFE_BROWSING) {
-  XPCOMUtils.defineLazyModuleGetter(this, "SafeBrowsing",
-                                    "resource://gre/modules/SafeBrowsing.jsm");
-}
-
 XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
                                   "resource://gre/modules/PrivateBrowsingUtils.jsm");
 
@@ -381,11 +376,6 @@ var BrowserApp = {
           CastingApps.init();
           DownloadNotifications.init();
 
-          if (AppConstants.MOZ_SAFE_BROWSING) {
-            // Bug 778855 - Perf regression if we do this here. To be addressed in bug 779008.
-            SafeBrowsing.init();
-          };
-
           // Delay this a minute because there's no rush
           setTimeout(() => {
             BrowserApp.gmpInstallManager = new GMPInstallManager();
diff --git a/mobile/android/components/MobileComponents.manifest b/mobile/android/components/MobileComponents.manifest
index 9e33376a5..e2cb50810 100644
--- a/mobile/android/components/MobileComponents.manifest
+++ b/mobile/android/components/MobileComponents.manifest
@@ -15,9 +15,6 @@ contract @mozilla.org/network/protocol/about;1?what=privatebrowsing {322ba47e-70
 #ifdef MOZ_SERVICES_HEALTHREPORT
 contract @mozilla.org/network/protocol/about;1?what=healthreport {322ba47e-7047-4f71-aebf-cb7d69325cd9}
 #endif
-#ifdef MOZ_SAFE_BROWSING
-contract @mozilla.org/network/protocol/about;1?what=blocked {322ba47e-7047-4f71-aebf-cb7d69325cd9}
-#endif
 #ifdef MOZ_DEVICES
 contract @mozilla.org/network/protocol/about;1?what=devices {322ba47e-7047-4f71-aebf-cb7d69325cd9}
 #endif
diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh
index 85de36d79..003f340ba 100755
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -16,8 +16,6 @@ MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/android/branding/official
 # See the --enable-android-min-sdk and --enable-android-max-sdk arguments in configure.in.
 MOZ_ANDROID_MIN_SDK_VERSION=9
 
-MOZ_SAFE_BROWSING=1
-
 MOZ_NO_SMART_CARDS=1
 
 # Enable getUserMedia
diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in
index ae9e77b42..e8bf5cae6 100644
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -457,15 +457,6 @@
 ; Modules
 @BINPATH@/modules/*
 
-#ifdef MOZ_SAFE_BROWSING
-; Safe Browsing
-@BINPATH@/components/nsURLClassifier.manifest
-@BINPATH@/components/nsUrlClassifierHashCompleter.js
-@BINPATH@/components/nsUrlClassifierListManager.js
-@BINPATH@/components/nsUrlClassifierLib.js
-@BINPATH@/components/url-classifier.xpt
-#endif
-
 ; GNOME hooks
 #ifdef MOZ_ENABLE_GNOME_COMPONENT
 @BINPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@
@@ -606,9 +597,6 @@ bin/libfreebl_32int64_3.so
 @BINPATH@/components/PaymentsUI.js
 @BINPATH@/components/PaymentProviderStrategy.js
 
-#ifdef MOZ_SAFE_BROWSING
-@BINPATH@/components/SafeBrowsing.jsm
-#endif
 @BINPATH@/components/XPIDialogService.js
 @BINPATH@/components/browsercomps.xpt
 
diff --git a/mobile/android/modules/AppConstants.jsm b/mobile/android/modules/AppConstants.jsm
index 903e75725..5524e0059 100644
--- a/mobile/android/modules/AppConstants.jsm
+++ b/mobile/android/modules/AppConstants.jsm
@@ -63,13 +63,6 @@ let AppConstants = Object.freeze({
   false,
 #endif
 
-  MOZ_SAFE_BROWSING:
-#ifdef MOZ_SAFE_BROWSING
-  true,
-#else
-  false,
-#endif
-
   MOZ_TELEMETRY_REPORTING:
 #ifdef MOZ_TELEMETRY_REPORTING
   true,
diff --git a/mobile/android/modules/moz.build b/mobile/android/modules/moz.build
index 1a69369f0..c0437db14 100644
--- a/mobile/android/modules/moz.build
+++ b/mobile/android/modules/moz.build
@@ -36,8 +36,7 @@ for var in ('ANDROID_PACKAGE_NAME', 'MOZ_APP_VERSION'):
 
 for var in ('NIGHTLY_BUILD', 'RELEASE_BUILD', 'ACCESSIBILITY',
     'MOZILLA_OFFICIAL', 'MOZ_OFFICIAL_BRANDING', 'MOZ_SERVICES_HEALTHREPORT',
-    'MOZ_DEVICES', 'MOZ_DEVICES', 'MOZ_SAFE_BROWSING',
-    'MOZ_TELEMETRY_REPORTING', 'MOZ_WEBRTC'):
+    'MOZ_DEVICES', 'MOZ_DEVICES', 'MOZ_TELEMETRY_REPORTING', 'MOZ_WEBRTC'):
     if CONFIG[var]:
         DEFINES[var] = 1