Bug 977454 - export network location provider on b2g. r=khuey

b2g/installer/package-manifest.in

@@ -375,6 +375,8 @@
 @BINPATH@/components/nsLoginInfo.js
 @BINPATH@/components/nsLoginManager.js
 @BINPATH@/components/nsLoginManagerPrompter.js
+@BINPATH@/components/NetworkGeolocationProvider.manifest
+@BINPATH@/components/NetworkGeolocationProvider.js
 #ifdef MOZ_WEBRTC
 @BINPATH@/components/PeerConnection.js
 @BINPATH@/components/PeerConnection.manifest

configure.in

@@ -8099,12 +8099,7 @@ dnl option to disable necko's wifi scanner
 dnl
 
 case "$OS_TARGET" in
-  Android)
-    if test -n "$gonkdir"; then
-      NECKO_WIFI=1
-    fi
-    ;;
-  Darwin|SunOS|WINNT)
+  Android|Darwin|SunOS|WINNT)
     NECKO_WIFI=1
     ;;
   Linux)

dom/src/geolocation/nsGeolocation.cpp

@@ -694,6 +694,10 @@ nsresult nsGeolocationService::Init()
   }
 #endif
 
+  if (Preferences::GetBool("geo.provider.use_mls", false)) {
+    mProvider = do_GetService("@mozilla.org/geolocation/mls-provider;1");
+  }
+
   // Override platform-specific providers with the default (network)
   // provider while testing. Our tests are currently not meant to exercise
   // the provider, and some tests rely on the network provider being used.

dom/system/NetworkGeolocationProvider.manifest

@@ -1,2 +1,3 @@
 component {77DA64D3-7458-4920-9491-86CC9914F904} NetworkGeolocationProvider.js
 contract @mozilla.org/geolocation/provider;1 {77DA64D3-7458-4920-9491-86CC9914F904}
+contract @mozilla.org/geolocation/mls-provider;1 {77DA64D3-7458-4920-9491-86CC9914F904}

dom/system/moz.build

@@ -38,13 +38,10 @@ UNIFIED_SOURCES += [
     'OSFileConstants.cpp',
 ]
 
-# On Systems that have build in geolocation providers,
-# we really do not need these.
-if CONFIG['OS_TARGET'] != 'Android' or CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
-    EXTRA_COMPONENTS += [
-        'NetworkGeolocationProvider.js',
-        'NetworkGeolocationProvider.manifest',
-    ]
+EXTRA_COMPONENTS += [
+    'NetworkGeolocationProvider.js',
+    'NetworkGeolocationProvider.manifest',
+]
 
 FAIL_ON_WARNINGS = True