Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode.

content/renderer/renderer_blink_platform_impl.cc

Index: content/renderer/renderer_blink_platform_impl.cc
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
index 339af699cf3917c0519e1e23228f5ab38b7ae9fb..a00ffe5f6b065bc730899b196a4a063de592e5d2 100644
--- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -4,6 +4,7 @@
 
 #include "content/renderer/renderer_blink_platform_impl.h"
 
+#include <memory>
 #include <utility>
 
 #include "base/command_line.h"
@@ -1192,7 +1193,7 @@ void RendererBlinkPlatformImpl::SetPlatformEventObserverForTesting(
     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() {
@@ -1207,7 +1208,9 @@ void RendererBlinkPlatformImpl::startListening(
     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);