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

device/geolocation/location_arbitrator_impl.h

Index: device/geolocation/location_arbitrator_impl.h
diff --git a/device/geolocation/location_arbitrator_impl.h b/device/geolocation/location_arbitrator_impl.h
index f21fb9990a15d167a39b4531db4436efe4c645dd..ad6100bac814aeb0af0ec8a5e0175fa2b87e7305 100644
--- a/device/geolocation/location_arbitrator_impl.h
+++ b/device/geolocation/location_arbitrator_impl.h
@@ -6,6 +6,7 @@
 #define DEVICE_GEOLOCATION_LOCATION_ARBITRATOR_IMPL_H_
 
 #include <stdint.h>
+#include <memory>

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

What's this extra include needed for?

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

Lint complains without it. It's because we are using unique_ptrs.

 #include <vector>
 
 #include "base/callback_forward.h"
@@ -18,7 +19,6 @@
 #include "device/geolocation/geolocation_export.h"
 #include "device/geolocation/geolocation_provider.h"
 #include "device/geolocation/geoposition.h"
-#include "device/geolocation/location_arbitrator.h"
 #include "device/geolocation/location_provider.h"
 #include "net/url_request/url_request_context_getter.h"
 
@@ -35,7 +35,7 @@ class LocationProvider;
 // providers and resolving them to a single 'best' location fix at any given
 // moment.
 class DEVICE_GEOLOCATION_EXPORT LocationArbitratorImpl
-    : public LocationArbitrator {
+    : public LocationProvider {
  public:
   // Number of milliseconds newer a location provider has to be that it's worth
   // switching to this location provider on the basis of it being fresher
@@ -50,11 +50,16 @@ class DEVICE_GEOLOCATION_EXPORT LocationArbitratorImpl
 
   static GURL DefaultNetworkProviderURL();
 
-  // LocationArbitrator
-  void StartProviders(bool enable_high_accuracy) override;
-  void StopProviders() override;
+  // LocationProvider

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

nit: "LocationProvider implementation."

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

Done.

+  void SetUpdateCallback(
+      const LocationProviderUpdateCallback& callback) override;
+  bool StartProvider(bool enable_high_accuracy) override;
+  void StopProvider() override;
+  void GetPosition(Geoposition* position) override;
+  void RequestRefresh() override;
   void OnPermissionGranted() override;
-  bool HasPermissionBeenGranted() const override;
+
+  bool HasPermissionBeenGranted() const;

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

Is this only used in tests, as discussed? If so then rename
HasPermissionBeenGrantedForTest() so that only test code can call it. :)

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

Done. Question, does adding "ForTest" to the end have an actual side effect, or
is just a guideline? 

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

IIRC there is a Clang plugin that will complain if you add code that calls
ForTest, but which is not in a _test.cc file, but yes, even without that, it's
good to be clear that this is not intended for production use. :)

 
  protected:
   // These functions are useful for injection of dependencies in derived