Backout 35d48d9d80d5 (bug 752982) for landing without proper review.

Author: rvandermeulen

b2g/installer/package-manifest.in

@@ -287,9 +287,6 @@
 @BINPATH@/components/services-crypto.xpt
 #endif
 @BINPATH@/components/services-crypto-component.xpt
-#ifdef MOZ_SERVICES_CAPTIVEDETECT
-@BINPATH@/components/services-captivedetect.xpt
-#endif
 @BINPATH@/components/shellservice.xpt
 @BINPATH@/components/shistory.xpt
 @BINPATH@/components/spellchecker.xpt
@@ -496,10 +493,6 @@
 @BINPATH@/components/HealthReportComponents.manifest
 @BINPATH@/components/HealthReportService.js
 #endif
-#ifdef MOZ_SERVICES_CAPTIVEDETECT
-@BINPATH@/components/CaptivePortalDetectComponents.manifest
-@BINPATH@/components/captivedetect.js
-#endif
 @BINPATH@/components/TelemetryPing.js
 @BINPATH@/components/TelemetryPing.manifest
 @BINPATH@/components/Webapps.js
@@ -597,9 +590,6 @@
 #ifdef MOZ_SERVICES_SYNC
 @BINPATH@/defaults/pref/services-sync.js
 #endif
-#ifdef MOZ_SERVICES_CAPTIVEDETECT
-@BINPATH@/defaults/pref/services-captivedetect.js
-#endif
 
 ; [Layout Engine Resources]
 ; Style Sheets, Graphics and other Resources used by the layout engine. 

browser/installer/package-manifest.in

@@ -286,9 +286,6 @@
 @BINPATH@/components/saxparser.xpt
 @BINPATH@/browser/components/sessionstore.xpt
 @BINPATH@/components/services-crypto-component.xpt
-#ifdef MOZ_SERVICES_CAPTIVEDETECT
-@BINPATH@/components/services-captivedetect.xpt
-#endif
 @BINPATH@/browser/components/shellservice.xpt
 @BINPATH@/components/shistory.xpt
 @BINPATH@/components/spellchecker.xpt
@@ -487,10 +484,6 @@
 @BINPATH@/components/SyncComponents.manifest
 @BINPATH@/components/Weave.js
 #endif
-#ifdef MOZ_SERVICES_CAPTIVEDETECT
-@BINPATH@/components/CaptivePortalDetectComponents.manifest
-@BINPATH@/components/captivedetect.js
-#endif
 @BINPATH@/components/servicesComponents.manifest
 @BINPATH@/components/cryptoComponents.manifest
 @BINPATH@/components/TelemetryPing.js

browser/installer/removed-files.in

@@ -976,7 +976,6 @@ xpicleanup@BIN_SUFFIX@
   defaults/pref/firefox.js
   defaults/pref/firefox-l10n.js
   defaults/pref/services-sync.js
-  defaults/pref/services-captivedetect.js
   defaults/profile/bookmarks.html
   defaults/profile/chrome/userChrome-example.css
   defaults/profile/chrome/userContent-example.css

configure.in

@@ -8388,12 +8388,6 @@ if test -n "$MOZ_SERVICES_SYNC"; then
   AC_DEFINE(MOZ_SERVICES_SYNC)
 fi
 
-dnl Build Captive Portal Detector if required
-AC_SUBST(MOZ_SERVICES_CAPTIVEDETECT)
-if test -n "$MOZ_SERVICES_CAPTIVEDETECT"; then
-  AC_DEFINE(MOZ_SERVICES_CAPTIVEDETECT)
-fi
-
 dnl ========================================================
 if test "$MOZ_DEBUG" -o "$NS_TRACE_MALLOC" -o "$MOZ_DMD"; then
     MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS=

mobile/android/installer/package-manifest.in

@@ -210,9 +210,6 @@
 @BINPATH@/components/saxparser.xpt
 @BINPATH@/components/sessionstore.xpt
 @BINPATH@/components/services-crypto-component.xpt
-#ifdef MOZ_SERVICES_CAPTIVEDETECT
-@BINPATH@/components/services-captivedetect.xpt
-#endif
 @BINPATH@/components/shellservice.xpt
 @BINPATH@/components/shistory.xpt
 @BINPATH@/components/spellchecker.xpt
@@ -380,11 +377,6 @@
 @BINPATH@/components/HealthReportService.js
 #endif
 
-#ifdef MOZ_SERVICES_CAPTIVEDETECT
-@BINPATH@/components/CaptivePortalDetectComponents.manifest
-@BINPATH@/components/captivedetect.js
-#endif
-
 ; Modules
 @BINPATH@/modules/*
 
@@ -436,10 +428,6 @@
 @BINPATH@/defaults/autoconfig/prefcalls.js
 @BINPATH@/defaults/profile/prefs.js
 
-#ifdef MOZ_SERVICES_CAPTIVEDETECT
-@BINPATH@/defaults/pref/services-captivedetect.js
-#endif
-
 ; [Layout Engine Resources]
 ; Style Sheets, Graphics and other Resources used by the layout engine. 
 @BINPATH@/res/EditorOverride.css

services/Makefile.in

@@ -30,8 +30,4 @@ ifdef MOZ_SERVICES_SYNC
 PARALLEL_DIRS += sync
 endif
 
-ifdef MOZ_SERVICES_CAPTIVEDETECT
-PARALLEL_DIRS += captivedetect
-endif
-
 include $(topsrcdir)/config/rules.mk