Geolocation cleanup: make GeolocationDelegate::OverrideSystemLocationProvider return unique_ptr

blimp/engine/app/blimp_content_browser_client.cc

 // Copyright (c) 2015 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 "blimp/engine/app/blimp_content_browser_client.h"
 #include "blimp/engine/app/blimp_browser_main_parts.h"
 #include "blimp/engine/app/settings_manager.h"
 #include "blimp/engine/feature/geolocation/blimp_location_provider.h"
 #include "blimp/engine/mojo/blob_channel_service.h"
 #include "content/public/browser/geolocation_delegate.h"
 #include "services/shell/public/cpp/interface_registry.h"
 
 namespace blimp {
 namespace engine {
 
 namespace {
 // A provider of services needed by Geolocation.
 class BlimpGeolocationDelegate : public content::GeolocationDelegate {
  public:
   BlimpGeolocationDelegate() = default;
 
   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);
 };
 
 }  // anonymous namespace
 
 BlimpContentBrowserClient::BlimpContentBrowserClient() {}
 
 BlimpContentBrowserClient::~BlimpContentBrowserClient() {}
 
 content::BrowserMainParts* BlimpContentBrowserClient::CreateBrowserMainParts(
@@ skipping 28 matching lines @@
 void BlimpContentBrowserClient::ExposeInterfacesToRenderer(
     shell::InterfaceRegistry* registry,
     content::RenderProcessHost* render_process_host) {
   registry->AddInterface<mojom::BlobChannel>(
       base::Bind(&BlobChannelService::Create,
                  blimp_browser_main_parts_->GetBlobChannelSender()));
 }
 
 }  // namespace engine
 }  // namespace blimp