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 123 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())
     access_token_store_ = NewAccessTokenStore();
   return access_token_store_.get();

[Wez, 2016/07/12 21:55:47]

Update this to

if (!access_token_store_)
  ...

[mcasas, 2016/07/15 22:45:53]

Done.

 }
 
 std::unique_ptr<LocationProvider>
 LocationArbitratorImpl::NewNetworkLocationProvider(
     AccessTokenStore* access_token_store,
     net::URLRequestContextGetter* context,
     const GURL& url,
     const base::string16& access_token) {
 #if defined(OS_ANDROID)
   // Android uses its own SystemLocationProvider.
@@ skipping 41 matching lines @@
     }
   }
   return false;
 }
 
 bool LocationArbitratorImpl::HasPermissionBeenGranted() const {
   return is_permission_granted_;
 }
 
 }  // namespace content