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

device/geolocation/mock_location_arbitrator.h

Index: device/geolocation/mock_location_arbitrator.h
diff --git a/device/geolocation/mock_location_arbitrator.h b/device/geolocation/mock_location_arbitrator.h
index 982890d5981ef21396ea2d69c59dad12490df0f0..82bbef25393d2bd8123a1a3f0988617e57788e3d 100644
--- a/device/geolocation/mock_location_arbitrator.h
+++ b/device/geolocation/mock_location_arbitrator.h
@@ -7,23 +7,28 @@
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "device/geolocation/location_arbitrator.h"
+#include "device/geolocation/location_provider.h"
 
 namespace device {
 
 struct Geoposition;
 
-class MockLocationArbitrator : public LocationArbitrator {
+class MockLocationArbitrator : public LocationProvider {

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

It looks like MockLocationArbitrator is only used in the GeolocationProviderImpl
unit-tests, and the only bit specific to this mock that is used is the
providers_started() getter, which as far as I can tell just checks whether
StartProvider() was called, so can be implemented as an EXPECT_CALL, or
alternatively would probably make a reasonable getter to add to
MockLocationProvider.

Either way, I think you can just remove this mock.

[Kevin M, 2016/08/10 23:16:19]

Agreed about the removal, but a FYI point - mocks should be renamed if the
object that they mock is renamed. So this would become MockLocationProvider.

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

Acknowledged.

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

Done.

  public:
   MockLocationArbitrator();
 
   bool providers_started() const { return providers_started_; }
 
-  // LocationArbitrator:
-  void StartProviders(bool enable_high_accuracy) override;
-  void StopProviders() override;
+  // LocationProvider:
+  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;

[Kevin M, 2016/08/10 23:16:19]

No point in declaring new methods in mocks that aren't virtual overrides unless
the test code is going to call them - no vtable entries => no dynamic dispatch!

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

Acknowledged.

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

Acknowledged.

 
  private:
   bool permission_granted_;