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

device/geolocation/geolocation_provider_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/geolocation/geolocation_provider_impl.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/lazy_instance.h"
@@ skipping 122 matching lines @@
     task = base::Bind(&GeolocationProviderImpl::StartProviders,
                       base::Unretained(this), enable_high_accuracy);
   }
 
   task_runner()->PostTask(FROM_HERE, task);
 }
 
 void GeolocationProviderImpl::StopProviders() {
   DCHECK(OnGeolocationThread());
   DCHECK(arbitrator_);
-  arbitrator_->StopProviders();
+  arbitrator_->StopProvider();
 }
 
 void GeolocationProviderImpl::StartProviders(bool enable_high_accuracy) {
   DCHECK(OnGeolocationThread());
   DCHECK(arbitrator_);
-  arbitrator_->StartProviders(enable_high_accuracy);
+  arbitrator_->StartProvider(enable_high_accuracy);
 }
 
 void GeolocationProviderImpl::InformProvidersPermissionGranted() {
   DCHECK(IsRunning());
   if (!OnGeolocationThread()) {
     task_runner()->PostTask(
         FROM_HERE,
         base::Bind(&GeolocationProviderImpl::InformProvidersPermissionGranted,
                    base::Unretained(this)));
     return;
@@ skipping 16 matching lines @@
   DCHECK(OnGeolocationThread());
   DCHECK(!arbitrator_);
   arbitrator_ = CreateArbitrator();
 }
 
 void GeolocationProviderImpl::CleanUp() {
   DCHECK(OnGeolocationThread());
   arbitrator_.reset();
 }
 
-std::unique_ptr<LocationArbitrator>
+std::unique_ptr<LocationProvider>
 GeolocationProviderImpl::CreateArbitrator() {
   LocationArbitratorImpl::LocationUpdateCallback callback = base::Bind(
       &GeolocationProviderImpl::OnLocationUpdate, base::Unretained(this));
   // Use the embedder's |g_delegate| or fall back to the default one.
   if (!g_delegate.Get())
     g_delegate.Get().reset(new GeolocationDelegate);
 
   return base::WrapUnique(
       new LocationArbitratorImpl(callback, g_delegate.Get().get()));
 }
 
 }  // namespace device