Geolocation cleanup: corrects uses of content::AccessTokenStore* and net::URLRequestContextGetter*

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"
@@ skipping 18 matching lines @@
     11 * base::Time::kMillisecondsPerSecond;
 
 LocationArbitratorImpl::LocationArbitratorImpl(
     const LocationUpdateCallback& callback,
     GeolocationDelegate* delegate)
     : delegate_(delegate),
       arbitrator_update_callback_(callback),
       provider_update_callback_(
           base::Bind(&LocationArbitratorImpl::OnLocationUpdate,
                      base::Unretained(this))),
-      position_provider_(NULL),
+      position_provider_(nullptr),
       is_permission_granted_(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();
+    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;
     }
   }
   DoStartProviders();
 }
 
 void 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;
   }
   for (const auto& provider : providers_)
     provider->StartProvider(enable_high_accuracy_);
 }
 
 void LocationArbitratorImpl::StopProviders() {
   // Reset the reference location state (provider+position)
   // so that future starts use fresh locations from
   // the newly constructed providers.
-  position_provider_ = NULL;
+  position_provider_ = nullptr;
   position_ = Geoposition();
 
   providers_.clear();
   is_running_ = false;
 }
 
 void LocationArbitratorImpl::OnAccessTokenStoresLoaded(
     AccessTokenStore::AccessTokenMap access_token_map,
-    net::URLRequestContextGetter* context_getter) {
+    const scoped_refptr<net::URLRequestContextGetter>& context_getter) {
   // If there are no access tokens, boot strap it with the default server URL.
   if (access_token_map.empty())
     access_token_map[DefaultNetworkProviderURL()];
   for (const auto& entry : access_token_map) {
     RegisterProvider(NewNetworkLocationProvider(
         GetAccessTokenStore(), context_getter, entry.first, entry.second));
   }
   DoStartProviders();
 }
 
@@ skipping 20 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_);
 }
 
-AccessTokenStore* LocationArbitratorImpl::NewAccessTokenStore() {
+scoped_refptr<AccessTokenStore> LocationArbitratorImpl::NewAccessTokenStore() {
   return delegate_->CreateAccessTokenStore();
 }
 
-AccessTokenStore* LocationArbitratorImpl::GetAccessTokenStore() {
-  if (!access_token_store_.get())
+scoped_refptr<AccessTokenStore> LocationArbitratorImpl::GetAccessTokenStore() {
+  if (!access_token_store_)
     access_token_store_ = NewAccessTokenStore();
-  return access_token_store_.get();
+  return access_token_store_;

[Wez, 2016/07/18 22:49:18]

nit: Why did this move back?

[mcasas, 2016/07/19 01:18:18]

I moved it to where it was supposed to go to,
if method definition was to follow method
declaration, and then I recently realized that
they are not following that (Chromium) pattern,
so in the interest of smallest amount of modified
lines, I moved it back to where it was.

 }
 
 std::unique_ptr<LocationProvider>
 LocationArbitratorImpl::NewNetworkLocationProvider(
-    AccessTokenStore* access_token_store,
-    net::URLRequestContextGetter* context,
+    const scoped_refptr<AccessTokenStore>& access_token_store,
+    const scoped_refptr<net::URLRequestContextGetter>& context,
     const GURL& url,
     const base::string16& access_token) {
 #if defined(OS_ANDROID)
   // Android uses its own SystemLocationProvider.
-  return NULL;
+  return nullptr;
 #else
   return base::WrapUnique(new NetworkLocationProvider(
       access_token_store, context, url, access_token));
 #endif
 }
 
 std::unique_ptr<LocationProvider>
 LocationArbitratorImpl::NewSystemLocationProvider() {
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-  return NULL;
+  return nullptr;
 #else
-  return base::WrapUnique(content::NewSystemLocationProvider());
+  return content::NewSystemLocationProvider();
 #endif
 }
 
 base::Time LocationArbitratorImpl::GetTimeNow() const {
   return base::Time::Now();
 }
 
 bool LocationArbitratorImpl::IsNewPositionBetter(
     const Geoposition& old_position, const Geoposition& new_position,
     bool from_same_provider) const {
@@ skipping 18 matching lines @@
     }
   }
   return false;
 }
 
 bool LocationArbitratorImpl::HasPermissionBeenGranted() const {
   return is_permission_granted_;
 }
 
 }  // namespace content