Geolocation cleanup: make GeolocationDelegate::OverrideSystemLocationProvider return unique_ptr

content/browser/geolocation/location_arbitrator_impl_unittest.cc

Index: content/browser/geolocation/location_arbitrator_impl_unittest.cc
diff --git a/content/browser/geolocation/location_arbitrator_impl_unittest.cc b/content/browser/geolocation/location_arbitrator_impl_unittest.cc
index 706f28a5b088347347c505fee12016adfd8718df..c2a616e586d8c4be2baad3ecdff9ea5ce5184830 100644
--- a/content/browser/geolocation/location_arbitrator_impl_unittest.cc
+++ b/content/browser/geolocation/location_arbitrator_impl_unittest.cc
@@ -74,19 +74,19 @@ class FakeGeolocationDelegate : public GeolocationDelegate {
   bool UseNetworkLocationProviders() override { return use_network_; }
   void set_use_network(bool use_network) { use_network_ = use_network; }
 
-  LocationProvider* OverrideSystemLocationProvider() override {
-    if (!system_location_provider_)
-      system_location_provider_ = base::WrapUnique(new MockLocationProvider);
-    return system_location_provider_.get();
+  std::unique_ptr<LocationProvider> OverrideSystemLocationProvider() override {
+    std::unique_ptr<LocationProvider> provider(new MockLocationProvider);
+    system_location_provider_ = provider.get();
+    return provider;
   }
 
   LocationProvider* system_location_provider() const {
-    return system_location_provider_.get();
+    return system_location_provider_;
   }
 
  private:
   bool use_network_ = true;
-  std::unique_ptr<LocationProvider> system_location_provider_;
+  LocationProvider* system_location_provider_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(FakeGeolocationDelegate);
 };
@@ -132,7 +132,9 @@ class TestingLocationArbitrator : public LocationArbitratorImpl {
   LocationProvider* GetLocationProvider() {
     if (is_fake_delegate_)
       return GetFakeGeolocationDelegate()->system_location_provider();
-    return GetDelegateForTesting()->OverrideSystemLocationProvider();
+    system_location_provider_ =
+        GetDelegateForTesting()->OverrideSystemLocationProvider();
+    return system_location_provider_.get();
   }
 
   const bool is_fake_delegate_;
@@ -141,11 +143,11 @@ class TestingLocationArbitrator : public LocationArbitratorImpl {
   // readable. Note |gps_| will only be set when there is a high accuracy
   // observer registered (and |cell_| when there's at least one observer of any
   // type).
-
   // TODO(mvanouwerkerk): rename |cell_| to |network_location_provider_| and
-  // |gps_| to |system_location_provider_|
+  // |gps_| to |gps_location_provider_|
   MockLocationProvider* cell_;
   MockLocationProvider* gps_;
+  std::unique_ptr<LocationProvider> system_location_provider_;
   scoped_refptr<AccessTokenStore> access_token_store_;
 };