Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode.

content/renderer/screen_orientation/screen_orientation_dispatcher.cc

 // Copyright 2014 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/screen_orientation/screen_orientation_dispatcher.h"
 
+#include <memory>
+
 #include "content/common/screen_orientation_messages.h"
 
 namespace content {
 
 ScreenOrientationDispatcher::ScreenOrientationDispatcher(
     RenderFrame* render_frame)
     : RenderFrameObserver(render_frame) {
 }
 
 ScreenOrientationDispatcher::~ScreenOrientationDispatcher() {
@@ skipping 40 matching lines @@
 void ScreenOrientationDispatcher::CancelPendingLocks() {
   for (CallbackMap::Iterator<blink::WebLockOrientationCallback>
        iterator(&pending_callbacks_); !iterator.IsAtEnd(); iterator.Advance()) {
     iterator.GetCurrentValue()->onError(blink::WebLockOrientationErrorCanceled);
     pending_callbacks_.Remove(iterator.GetCurrentKey());
   }
 }
 
 void ScreenOrientationDispatcher::lockOrientation(
     blink::WebScreenOrientationLockType orientation,
     blink::WebLockOrientationCallback* callback) {

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

same

[rlanday, 2016/11/22 18:22:33]

There's a unit test that creates something called a MockLockOrientationCallback
which has a private destructor, making it not work with unique_ptr:
https://cs.chromium.org/chromium/src/content/renderer/screen_orientation/scre...

I'm afraid to change it because I'm not sure how it works.

[rlanday, 2016/11/22 19:08:04]

note: I ended up just making the destructor public here, I assume it doesn't
really change anything since it's only used in the test case...

   CancelPendingLocks();
 
-  int request_id = pending_callbacks_.Add(callback);
+  int request_id = pending_callbacks_.Add(
+      std::unique_ptr<blink::WebLockOrientationCallback>(callback));
   Send(new ScreenOrientationHostMsg_LockRequest(
       routing_id(), orientation, request_id));
 }
 
 void ScreenOrientationDispatcher::unlockOrientation() {
   CancelPendingLocks();
   Send(new ScreenOrientationHostMsg_Unlock(routing_id()));
 }
 
 }  // namespace content