Upstream Android Geolocation

content/browser/geolocation/arbitrator_dependency_factory.cc

Index: content/browser/geolocation/arbitrator_dependency_factory.cc
diff --git a/content/browser/geolocation/arbitrator_dependency_factory.cc b/content/browser/geolocation/arbitrator_dependency_factory.cc
index 0be268eb585621e205b74605fdfba76c61e06b9c..f2b022de4c0be83bf20b7625f56bce654e7dad7b 100644
--- a/content/browser/geolocation/arbitrator_dependency_factory.cc
+++ b/content/browser/geolocation/arbitrator_dependency_factory.cc
@@ -33,8 +33,13 @@ DefaultGeolocationArbitratorDependencyFactory::NewNetworkLocationProvider(
     net::URLRequestContextGetter* context,
     const GURL& url,
     const string16& access_token) {
+#if defined(OS_ANDROID)
+  // Android uses its own SystemLocationProvider.
+  return NULL;
+#else
   return ::NewNetworkLocationProvider(access_token_store, context,
                                       url, access_token);
+#endif
 }
 
 LocationProviderBase*