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

content/browser/geolocation/location_arbitrator_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_GEOLOCATION_LOCATION_ARBITRATOR_IMPL_H_
 #define CONTENT_BROWSER_GEOLOCATION_LOCATION_ARBITRATOR_IMPL_H_
 
 #include <stdint.h>
 #include <vector>
 
@@ skipping 38 matching lines @@
 
   static GURL DefaultNetworkProviderURL();
 
   // LocationArbitrator
   void StartProviders(bool enable_high_accuracy) override;
   void StopProviders() override;
   void OnPermissionGranted() override;
   bool HasPermissionBeenGranted() const override;
 
  protected:
-  AccessTokenStore* GetAccessTokenStore();
-
   // These functions are useful for injection of dependencies in derived
   // testing classes.
-  virtual AccessTokenStore* NewAccessTokenStore();
+  virtual scoped_refptr<AccessTokenStore> NewAccessTokenStore();
   virtual std::unique_ptr<LocationProvider> 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);
   virtual std::unique_ptr<LocationProvider> NewSystemLocationProvider();
   virtual base::Time GetTimeNow() const;
 
  private:
   friend class TestingLocationArbitrator;
 
+  scoped_refptr<AccessTokenStore> GetAccessTokenStore();
+
   // Provider will either be added to |providers_| or
   // deleted on error (e.g. it fails to start).
   void RegisterProvider(std::unique_ptr<LocationProvider> provider);
 
   void RegisterSystemProvider();
   void OnAccessTokenStoresLoaded(
       AccessTokenStore::AccessTokenMap access_token_map,
-      net::URLRequestContextGetter* context_getter);
+      const scoped_refptr<net::URLRequestContextGetter>& context_getter);
   void DoStartProviders();
 
   // Gets called when a provider has a new position.
   void OnLocationUpdate(const LocationProvider* provider,
                         const Geoposition& new_position);
 
   // Returns true if |new_position| is an improvement over |old_position|.
   // Set |from_same_provider| to true if both the positions came from the same
   // provider.
   bool IsNewPositionBetter(const Geoposition& old_position,
                            const Geoposition& new_position,
                            bool from_same_provider) const;
 
   GeolocationDelegate* delegate_;
 
   scoped_refptr<AccessTokenStore> access_token_store_;
   LocationUpdateCallback arbitrator_update_callback_;
   LocationProvider::LocationProviderUpdateCallback provider_update_callback_;
 
   // The CancelableCallback will prevent OnAccessTokenStoresLoaded from being
   // called multiple times by calling Reset() at the time of binding.
-  base::CancelableCallback<void(AccessTokenStore::AccessTokenMap,
-                                net::URLRequestContextGetter*)>
+  base::CancelableCallback<void(
+      AccessTokenStore::AccessTokenMap,
+      const scoped_refptr<net::URLRequestContextGetter>&)>
       token_store_callback_;
   std::vector<std::unique_ptr<LocationProvider>> providers_;
   bool enable_high_accuracy_;
   // The provider which supplied the current |position_|
   const LocationProvider* position_provider_;
   bool is_permission_granted_;
   // The current best estimate of our position.
   Geoposition position_;
 
   // Tracks whether providers should be running.
   bool is_running_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationArbitratorImpl);
 };
 
 // Factory functions for the various types of location provider to abstract
 // over the platform-dependent implementations.
-LocationProvider* NewSystemLocationProvider();
+std::unique_ptr<LocationProvider> NewSystemLocationProvider();
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GEOLOCATION_LOCATION_ARBITRATOR_IMPL_H_