Geolocation: extract ContentBrowserClient methods specific to Geolocation into a class

content/browser/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 "content/browser/geolocation/location_arbitrator_impl.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "content/browser/geolocation/network_location_provider.h"
 #include "content/public/browser/access_token_store.h"
-#include "content/public/browser/content_browser_client.h"
 #include "content/public/common/content_client.h"
 #include "url/gurl.h"
 
 namespace content {
 namespace {
 
 const char* kDefaultNetworkProviderUrl =
     "https://www.googleapis.com/geolocation/v1/geolocate";
 }  // namespace
 
 // To avoid oscillations, set this to twice the expected update interval of a
 // a GPS-type location provider (in case it misses a beat) plus a little.
 const int64_t LocationArbitratorImpl::kFixStaleTimeoutMilliseconds =
     11 * base::Time::kMillisecondsPerSecond;
 
 LocationArbitratorImpl::LocationArbitratorImpl(
-    const LocationUpdateCallback& callback)
-    : arbitrator_update_callback_(callback),
+    const LocationUpdateCallback& callback,
+    GeolocationProvider::ServiceOverrides* service_overrides)
+    : service_overrides_(service_overrides),
+      arbitrator_update_callback_(callback),
       provider_update_callback_(
           base::Bind(&LocationArbitratorImpl::OnLocationUpdate,
                      base::Unretained(this))),
       position_provider_(NULL),
       is_permission_granted_(false),
-      is_running_(false) {
-}
+      is_running_(false) {}
 
 LocationArbitratorImpl::~LocationArbitratorImpl() {
 }
 
 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) {
   // Stash options as OnAccessTokenStoresLoaded has not yet been called.
   is_running_ = true;
   enable_high_accuracy_ = enable_high_accuracy;
 
   if (providers_.empty()) {
     RegisterSystemProvider();
 
     AccessTokenStore* access_token_store = GetAccessTokenStore();
     if (access_token_store &&
-        GetContentClient()->browser()->UseNetworkLocationProviders()) {
+        service_overrides_->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;
     }
   }
   DoStartProviders();
 }
@@ skipping 39 matching lines @@
     std::unique_ptr<LocationProvider> provider) {
   if (!provider)
     return;
   provider->SetUpdateCallback(provider_update_callback_);
   if (is_permission_granted_)
     provider->OnPermissionGranted();
   providers_.push_back(std::move(provider));
 }
 
 void LocationArbitratorImpl::RegisterSystemProvider() {
-  std::unique_ptr<LocationProvider> provider = base::WrapUnique(
-      GetContentClient()->browser()->OverrideSystemLocationProvider());
+  std::unique_ptr<LocationProvider> provider =
+      base::WrapUnique(service_overrides_->OverrideSystemLocationProvider());
   if (!provider)
     provider = NewSystemLocationProvider();
   RegisterProvider(std::move(provider));
 }
 
 void LocationArbitratorImpl::OnLocationUpdate(const LocationProvider* provider,
                                               const Geoposition& new_position) {
   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_);
 }
 
 AccessTokenStore* LocationArbitratorImpl::NewAccessTokenStore() {
-  return GetContentClient()->browser()->CreateAccessTokenStore();
+  return service_overrides_->CreateAccessTokenStore();
 }
 
 AccessTokenStore* LocationArbitratorImpl::GetAccessTokenStore() {
   if (!access_token_store_.get())
     access_token_store_ = NewAccessTokenStore();
   return access_token_store_.get();
 }
 
 std::unique_ptr<LocationProvider>
 LocationArbitratorImpl::NewNetworkLocationProvider(
@@ skipping 47 matching lines @@
     }
   }
   return false;
 }
 
 bool LocationArbitratorImpl::HasPermissionBeenGranted() const {
   return is_permission_granted_;
 }
 
 }  // namespace content