Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode.

content/renderer/renderer_blink_platform_impl.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/renderer/renderer_blink_platform_impl.h"
 
+#include <memory>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/guid.h"
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/shared_memory.h"
@@ skipping 1168 matching lines @@
   }
 
   return NULL;
 }
 
 void RendererBlinkPlatformImpl::SetPlatformEventObserverForTesting(
     blink::WebPlatformEventType type,
     std::unique_ptr<PlatformEventObserverBase> observer) {
   if (platform_event_observers_.Lookup(type))
     platform_event_observers_.Remove(type);
-  platform_event_observers_.AddWithID(observer.release(), type);
+  platform_event_observers_.AddWithID(std::move(observer), type);
 }
 
 blink::InterfaceProvider* RendererBlinkPlatformImpl::interfaceProvider() {
   return blink_interface_provider_.get();
 }
 
 void RendererBlinkPlatformImpl::startListening(
     blink::WebPlatformEventType type,
     blink::WebPlatformEventListener* listener) {
   PlatformEventObserverBase* observer = platform_event_observers_.Lookup(type);

[danakj, 2016/11/18 00:15:33]

Wait.. this gets a thing in the map already.. then puts it back in a unique_ptr
in the map.. double free?

[rlanday, 2016/11/18 18:57:13]

I believe it only inserts into the map if Lookup() returns null, in which case
it wraps the return value of CreatePlatformEventObserverFromType() rather than
something that was looked up in the map.

[danakj, 2016/11/18 19:13:29]

Oh right okay. Tho what we should do is..

   if (!observer) {
     observer = CreatePlatformEventObserverFromType(type);

[danakj, 2016/11/18 19:13:29]

Make this function return a unique_ptr, and use a unique_ptr var here please.
You can store a raw pointer back into |observer| for after this block.

     if (!observer)
       return;
-    platform_event_observers_.AddWithID(observer, static_cast<int32_t>(type));
+    platform_event_observers_.AddWithID(
+        std::unique_ptr<PlatformEventObserverBase>(observer),
+        static_cast<int32_t>(type));
   }
   observer->Start(listener);
 
   // Device events (motion, orientation and light) expect to get an event fired
   // as soon as a listener is registered if a fake data was passed before.
   // TODO(mlamouri,timvolodine): make those send mock values directly instead of
   // using this broken pattern.
   if (RenderThreadImpl::current() &&
       RenderThreadImpl::current()->layout_test_mode() &&
       (type == blink::WebPlatformEventTypeDeviceMotion ||
@@ skipping 69 matching lines @@
   return &trial_token_validator_;
 }
 
 void RendererBlinkPlatformImpl::workerContextCreated(
     const v8::Local<v8::Context>& worker) {
   GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread(
       worker);
 }
 
 }  // namespace content