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

device/geolocation/location_arbitrator_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/location_arbitrator_impl.h"
 
 #include <map>
+#include <memory>
+#include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "device/geolocation/access_token_store.h"
 #include "device/geolocation/geolocation_delegate.h"
 #include "device/geolocation/network_location_provider.h"
 #include "url/gurl.h"
 
@@ skipping 26 matching lines @@
 GURL LocationArbitratorImpl::DefaultNetworkProviderURL() {
   return GURL(kDefaultNetworkProviderUrl);
 }
 
 void LocationArbitratorImpl::OnPermissionGranted() {
   is_permission_granted_ = true;
   for (const auto& provider : providers_)
     provider->OnPermissionGranted();
 }
 
-void LocationArbitratorImpl::StartProviders(bool enable_high_accuracy) {
+bool LocationArbitratorImpl::StartProvider(bool enable_high_accuracy) {
   // Stash options as OnAccessTokenStoresLoaded has not yet been called.
   is_running_ = true;
   enable_high_accuracy_ = enable_high_accuracy;
 
   if (providers_.empty()) {
     RegisterSystemProvider();
 
     const scoped_refptr<AccessTokenStore> access_token_store =
         GetAccessTokenStore();
     if (access_token_store && delegate_->UseNetworkLocationProviders()) {
       DCHECK(DefaultNetworkProviderURL().is_valid());
       token_store_callback_.Reset(
           base::Bind(&LocationArbitratorImpl::OnAccessTokenStoresLoaded,
                      base::Unretained(this)));
       access_token_store->LoadAccessTokens(token_store_callback_.callback());
-      return;
+      return true;
     }
   }
-  DoStartProviders();
+  return DoStartProviders();
 }
 
-void LocationArbitratorImpl::DoStartProviders() {
+bool LocationArbitratorImpl::DoStartProviders() {
   if (providers_.empty()) {
     // If no providers are available, we report an error to avoid
     // callers waiting indefinitely for a reply.
     Geoposition position;
     position.error_code = Geoposition::ERROR_CODE_PERMISSION_DENIED;
     arbitrator_update_callback_.Run(position);
-    return;
+    return false;
   }
   for (const auto& provider : providers_)
     provider->StartProvider(enable_high_accuracy_);

[Kevin M, 2016/08/15 19:12:46]

This is throwing away the return value of StartProvider... intentional?

[CJ, 2016/08/15 20:11:51]

Done.

+  return true;
 }
 
-void LocationArbitratorImpl::StopProviders() {
+void LocationArbitratorImpl::StopProvider() {
   // Reset the reference location state (provider+position)
   // so that future starts use fresh locations from
   // the newly constructed providers.
   position_provider_ = nullptr;
   position_ = Geoposition();
 
   providers_.clear();
   is_running_ = false;
 }
 
@@ skipping 33 matching lines @@
   DCHECK(new_position.Validate() ||
          new_position.error_code != Geoposition::ERROR_CODE_NONE);
   if (!IsNewPositionBetter(position_, new_position,
                            provider == position_provider_))
     return;
   position_provider_ = provider;
   position_ = new_position;
   arbitrator_update_callback_.Run(position_);
 }
 
+void LocationArbitratorImpl::GetPosition(Geoposition* position) {

[Kevin M, 2016/08/15 19:12:46]

Change this to return a const Geoposition& and just return *position_ directly.
This is more syntactically pleasant to read, plus it gives the caller the
opportunity to avoid making a copy by just accessing fields from the reference.

[CJ, 2016/08/15 20:11:51]

Yeah I was wondering if I should refactor this. I wasn't sure if there was a
good reason to do it the way it is now.

+  *position = position_;
+}
+
+void LocationArbitratorImpl::SetUpdateCallback(
+    const LocationProviderUpdateCallback& callback) {

[Kevin M, 2016/08/15 19:12:46]

DCHECK(!callback.is_null())

[CJ, 2016/08/15 20:11:51]

Done.

+  provider_update_callback_ = callback;
+}
+
 scoped_refptr<AccessTokenStore> LocationArbitratorImpl::NewAccessTokenStore() {
   return delegate_->CreateAccessTokenStore();
 }
 
 scoped_refptr<AccessTokenStore> LocationArbitratorImpl::GetAccessTokenStore() {
   if (!access_token_store_)
     access_token_store_ = NewAccessTokenStore();
   return access_token_store_;
 }
 
@@ skipping 45 matching lines @@
       return true;
     } else if ((GetTimeNow() - old_position.timestamp).InMilliseconds() >
                kFixStaleTimeoutMilliseconds) {
       // Existing fix is stale.
       return true;
     }
   }
   return false;
 }
 
-bool LocationArbitratorImpl::HasPermissionBeenGranted() const {
+bool LocationArbitratorImpl::HasPermissionBeenGrantedForTest() const {
   return is_permission_granted_;
 }
 
 }  // namespace device