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..8b65f3713b3432fc0baa2e2e28a107c5185f7d00 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>
@@ -24,7 +25,6 @@ class SingleThreadTaskRunner;
 }
 
 namespace device {
-class LocationArbitrator;
 
 class DEVICE_GEOLOCATION_EXPORT GeolocationProviderImpl
     : public NON_EXPORTED_BASE(GeolocationProvider),
@@ -50,14 +50,16 @@ class DEVICE_GEOLOCATION_EXPORT GeolocationProviderImpl
     return user_did_opt_into_location_services_;
   }
 
+  // Useful for injecting mock geolocation arbitrator in tests.

[Wez, 2016/08/12 00:33:44]

nit: This comment is not super helpful - caller can work that out from the name
:P

What's helpful to know is that it _is_ safe to call from the "caller" thread,
but that it must be called while there are no GeolocationProviderImpl clients
registered, I think.

[CJ, 2016/08/12 20:22:46]

Done.

+  void SetArbitratorForTesting(LocationProvider* arbitrator);

[Wez, 2016/08/12 00:33:44]

Use unique_ptr<> here, so that it's clear that the caller is giving up ownership
of the supplied arbitrator.

[CJ, 2016/08/12 20:22:46]

Done.

+
  protected:

[Wez, 2016/08/12 00:33:44]

You can merge this with the private section, below, now that nothing needs to
derive from it.

[CJ, 2016/08/12 20:22:46]

Done.

   friend struct base::DefaultSingletonTraits<GeolocationProviderImpl>;
   GeolocationProviderImpl();
   ~GeolocationProviderImpl() override;
 
-  // Useful for injecting mock geolocation arbitrator in tests.
-  // TODO(mvanouwerkerk): Use something like SetArbitratorForTesting instead.
-  virtual std::unique_ptr<LocationArbitrator> CreateArbitrator();
+  // Only to be used on the geolocation thread.
+  std::unique_ptr<LocationProvider> arbitrator_;

[Wez, 2016/08/12 00:33:44]

Move this down to sit alongisde the other data members when you merge this with
the private section.

[CJ, 2016/08/12 20:22:46]

Done.

 
  private:
   bool OnGeolocationThread() const;
@@ -93,9 +95,6 @@ class DEVICE_GEOLOCATION_EXPORT GeolocationProviderImpl
   // True only in testing, where we want to use a custom position.
   bool ignore_location_updates_;
 
-  // Only to be used on the geolocation thread.
-  std::unique_ptr<LocationArbitrator> arbitrator_;
-
   // Used to PostTask()s from the geolocation thread to creation thread.
   const scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;