Hooks together Geolocation Feature in the Client and Engine.

device/geolocation/location_arbitrator_unittest.cc

Index: device/geolocation/location_arbitrator_unittest.cc
diff --git a/device/geolocation/location_arbitrator_impl_unittest.cc b/device/geolocation/location_arbitrator_unittest.cc
similarity index 97%
rename from device/geolocation/location_arbitrator_impl_unittest.cc
rename to device/geolocation/location_arbitrator_unittest.cc
index d91cc875518ecb16a37947d2ba568269956b014f..96021bffd5940d64b60bd22830659ccafa40f72e 100644
--- a/device/geolocation/location_arbitrator_impl_unittest.cc
+++ b/device/geolocation/location_arbitrator_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "device/geolocation/location_arbitrator_impl.h"
+#include "device/geolocation/location_arbitrator.h"
 
 #include <memory>
 #include <utility>
@@ -30,7 +30,8 @@ class MockLocationObserver {
     ASSERT_FALSE(last_position_.Validate());
   }
   // Delegate
-  void OnLocationUpdate(const LocationProvider*, const Geoposition& position) {
+  void OnLocationUpdate(const LocationProvider* provider,
+                        const Geoposition& position) {
     last_position_ = position;
   }
 
@@ -95,13 +96,13 @@ class FakeGeolocationDelegate : public GeolocationDelegate {
 
 }  // namespace
 
-class TestingLocationArbitrator : public LocationArbitratorImpl {
+class TestingLocationArbitrator : public LocationArbitrator {
  public:
   TestingLocationArbitrator(
       const LocationProviderUpdateCallback& callback,
       const scoped_refptr<AccessTokenStore>& access_token_store,
       GeolocationDelegate* delegate)
-      : LocationArbitratorImpl(delegate),
+      : LocationArbitrator(delegate),
         cell_(nullptr),
         gps_(nullptr),
         access_token_store_(access_token_store) {
@@ -174,7 +175,7 @@ class GeolocationLocationArbitratorTest : public testing::Test {
   base::TimeDelta SwitchOnFreshnessCliff() {
     // Add 1, to ensure it meets any greater-than test.
     return base::TimeDelta::FromMilliseconds(
-        LocationArbitratorImpl::kFixStaleTimeoutMilliseconds + 1);
+        LocationArbitrator::kFixStaleTimeoutMilliseconds + 1);
   }
 
   FakeLocationProvider* cell() { return arbitrator_->cell_; }