Hooks together Geolocation Feature in the Client and Engine.

device/geolocation/geolocation_provider_impl.cc

Index: device/geolocation/geolocation_provider_impl.cc
diff --git a/device/geolocation/geolocation_provider_impl.cc b/device/geolocation/geolocation_provider_impl.cc
index dde10c0a4440586e959d9fd9bc74666c7b6aa2c6..4c7e51c3ebabe70122d1626dab8aae5023f5f57f 100644
--- a/device/geolocation/geolocation_provider_impl.cc
+++ b/device/geolocation/geolocation_provider_impl.cc
@@ -17,7 +17,7 @@
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "device/geolocation/geolocation_delegate.h"
-#include "device/geolocation/location_arbitrator_impl.h"
+#include "device/geolocation/location_arbitrator.h"
 
 namespace device {
 
@@ -190,8 +190,7 @@ void GeolocationProviderImpl::Init() {
     if (!g_delegate.Get())
       g_delegate.Get().reset(new GeolocationDelegate);
 
-    arbitrator_ =
-        base::MakeUnique<LocationArbitratorImpl>(g_delegate.Get().get());
+    arbitrator_ = base::MakeUnique<LocationArbitrator>(g_delegate.Get().get());
     arbitrator_->SetUpdateCallback(callback);
   }
 }