From: thermatk <thermatk@thermatk.com>
Date: Fri, 22 Jun 2018 17:05:17 +0200
Subject: kill Location, fall back to system

License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
 services/device/geolocation/BUILD.gn                  |  1 -
 .../device/geolocation/LocationProviderFactory.java   | 11 ++---------
 services/device/public/cpp/device_features.cc         |  3 ++-
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/services/device/geolocation/BUILD.gn b/services/device/geolocation/BUILD.gn
--- a/services/device/geolocation/BUILD.gn
+++ b/services/device/geolocation/BUILD.gn
@@ -165,7 +165,6 @@ if (is_android) {
       "android/java/src/org/chromium/device/geolocation/LocationProviderAdapter.java",
       "android/java/src/org/chromium/device/geolocation/LocationProviderAndroid.java",
       "android/java/src/org/chromium/device/geolocation/LocationProviderFactory.java",
-      "android/java/src/org/chromium/device/geolocation/LocationProviderGmsCore.java",
     ]
 
     deps = [
diff --git a/services/device/geolocation/android/java/src/org/chromium/device/geolocation/LocationProviderFactory.java b/services/device/geolocation/android/java/src/org/chromium/device/geolocation/LocationProviderFactory.java
--- a/services/device/geolocation/android/java/src/org/chromium/device/geolocation/LocationProviderFactory.java
+++ b/services/device/geolocation/android/java/src/org/chromium/device/geolocation/LocationProviderFactory.java
@@ -26,19 +26,12 @@ public class LocationProviderFactory {
 
     @CalledByNative
     public static void useGmsCoreLocationProvider() {
-        sUseGmsCoreLocationProvider = true;
+        sUseGmsCoreLocationProvider = false;
     }
 
     public static LocationProvider create() {
         if (sProviderImpl != null) return sProviderImpl;
-
-        if (sUseGmsCoreLocationProvider
-                && LocationProviderGmsCore.isGooglePlayServicesAvailable(
-                        ContextUtils.getApplicationContext())) {
-            sProviderImpl = new LocationProviderGmsCore(ContextUtils.getApplicationContext());
-        } else {
-            sProviderImpl = new LocationProviderAndroid();
-        }
+        sProviderImpl = new LocationProviderAndroid();
         return sProviderImpl;
     }
 }
diff --git a/services/device/public/cpp/device_features.cc b/services/device/public/cpp/device_features.cc
--- a/services/device/public/cpp/device_features.cc
+++ b/services/device/public/cpp/device_features.cc
@@ -45,6 +45,7 @@ BASE_FEATURE(kWinSystemLocationPermission,
 BASE_FEATURE(kLocationProviderManager,
              "LocationProviderManager",
              base::FEATURE_DISABLED_BY_DEFAULT);
+SET_CROMITE_FEATURE_DISABLED(kLocationProviderManager);
 
 #if BUILDFLAG(IS_CHROMEOS)
 // Enables crash key logging for USB device open operations on ChromeOS. See
@@ -67,7 +68,7 @@ const base::FeatureParam<device::mojom::LocationProviderManagerMode>::Option
 const base::FeatureParam<device::mojom::LocationProviderManagerMode>
     kLocationProviderManagerParam{
         &kLocationProviderManager, "LocationProviderManagerMode",
-        device::mojom::LocationProviderManagerMode::kNetworkOnly,
+        device::mojom::LocationProviderManagerMode::kPlatformOnly,
         &location_provider_manager_mode_options};
 
 bool IsOsLevelGeolocationPermissionSupportEnabled() {
--