kill Location, fall back to system: keep disabled LocationProviderManager

---

 services/device/geolocation/BUILD.gn                  |  1 -

 .../device/geolocation/LocationProviderFactory.java   | 11 ++---------

 2 files changed, 2 insertions(+), 10 deletions(-)

 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

         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

@@ -38,6 +38,7 @@ BASE_FEATURE(kSerialPortConnected,

 BASE_FEATURE(kLocationProviderManager,

              "LocationProviderManager",

              base::FEATURE_DISABLED_BY_DEFAULT);

+SET_CROMITE_FEATURE_DISABLED(kLocationProviderManager);

 const base::FeatureParam<device::mojom::LocationProviderManagerMode>::Option

     location_provider_manager_mode_options[] = {

@@ -52,7 +53,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};

 }  // namespace features

--