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

content/browser/geolocation/location_provider_android.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_provider_android.h"
 
+#include "base/memory/ptr_util.h"
 #include "base/time/time.h"
 #include "content/browser/geolocation/location_api_adapter_android.h"
 #include "content/public/common/geoposition.h"
 
 namespace content {
 
 // LocationProviderAndroid
 LocationProviderAndroid::LocationProviderAndroid() {
 }
 
@@ skipping 20 matching lines @@
 }
 
 void LocationProviderAndroid::RequestRefresh() {
   // Nothing to do here, android framework will call us back on new position.
 }
 
 void LocationProviderAndroid::OnPermissionGranted() {
   // Nothing to do here.
 }
 
-LocationProvider* NewSystemLocationProvider() {
-  return new LocationProviderAndroid;
+// static
+std::unique_ptr<LocationProvider> NewSystemLocationProvider() {
+  return base::WrapUnique(new LocationProviderAndroid);
 }
 
 }  // namespace content