Gets rid of the LocationArbitrator interface, in preference for LocationProvider.

device/geolocation/geolocation_provider_impl.h

Index: device/geolocation/geolocation_provider_impl.h
diff --git a/device/geolocation/geolocation_provider_impl.h b/device/geolocation/geolocation_provider_impl.h
index e092b8b27ee299cc57da0848d66330c10eb1edc7..dcc48547108c92aa1f8da5d5683b6ce3c597f553 100644
--- a/device/geolocation/geolocation_provider_impl.h
+++ b/device/geolocation/geolocation_provider_impl.h
@@ -16,6 +16,7 @@
 #include "device/geolocation/geolocation_export.h"
 #include "device/geolocation/geolocation_provider.h"
 #include "device/geolocation/geoposition.h"
+#include "device/geolocation/location_provider.h"
 
 namespace base {
 template <typename Type>
@@ -57,7 +58,7 @@ class DEVICE_GEOLOCATION_EXPORT GeolocationProviderImpl
 
   // Useful for injecting mock geolocation arbitrator in tests.
   // TODO(mvanouwerkerk): Use something like SetArbitratorForTesting instead.

[Wez, 2016/08/09 01:17:04]

nit: Consider implementing this TODO() while you're here. :)

e.g. Create the LocationArbitrator in the Init() and allow it to be replaced
with a MockLocationProvider via the API as he suggests.

[CJ, 2016/08/11 22:06:43]

Done.

-  virtual std::unique_ptr<LocationArbitrator> CreateArbitrator();
+  virtual std::unique_ptr<LocationProvider> CreateArbitrator();
 
  private:
   bool OnGeolocationThread() const;
@@ -94,7 +95,7 @@ class DEVICE_GEOLOCATION_EXPORT GeolocationProviderImpl
   bool ignore_location_updates_;
 
   // Only to be used on the geolocation thread.
-  std::unique_ptr<LocationArbitrator> arbitrator_;
+  std::unique_ptr<LocationProvider> arbitrator_;
 
   // Used to PostTask()s from the geolocation thread to creation thread.
   const scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;