Geolocation cleanup: make GeolocationDelegate::OverrideSystemLocationProvider return unique_ptr

blimp/engine/app/blimp_content_browser_client.cc

Index: blimp/engine/app/blimp_content_browser_client.cc
diff --git a/blimp/engine/app/blimp_content_browser_client.cc b/blimp/engine/app/blimp_content_browser_client.cc
index 6c4f55229bcec8eab63f8214196cc550adee61bd..90ea2f52e4c78637305c63ea9346ec75d5085f3b 100644
--- a/blimp/engine/app/blimp_content_browser_client.cc
+++ b/blimp/engine/app/blimp_content_browser_client.cc
@@ -21,15 +21,12 @@ class BlimpGeolocationDelegate : public content::GeolocationDelegate {
 
   bool UseNetworkLocationProviders() final { return false; }
 
-  content::LocationProvider* OverrideSystemLocationProvider() final {
-    if (!location_provider_)
-      location_provider_ = base::WrapUnique(new BlimpLocationProvider());
-    return location_provider_.get();
+  std::unique_ptr<content::LocationProvider> OverrideSystemLocationProvider()
+      final {
+    return base::WrapUnique(new BlimpLocationProvider());
   }
 
  private:
-  std::unique_ptr<BlimpLocationProvider> location_provider_;

[Wez, 2016/07/07 18:51:39]

You're changing the ownership semantics here - was the old code broken?

[mcasas, 2016/07/07 19:07:09]

Probably - the result of OverrideSystemLocationProvider()
is base::WrapUnique() in [1] on ToT.


[1]
https://cs.chromium.org/chromium/src/content/browser/geolocation/location_arb...

-
   DISALLOW_COPY_AND_ASSIGN(BlimpGeolocationDelegate);
 };