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>

[danakj, 2016/11/30 00:34:01]

this file wants utility for move() rather than memory. the unique_ptr is coming
from the header so it should already be there.

[rlanday, 2016/11/30 15:52:01]

Oops...looks like git cl lint's flagging a couple other files for this as well
(e.g. the .h file for this .cc file), I'll add the header on those too

I assume I don't need this #include both here and in the .h?

[danakj, 2016/11/30 19:25:06]

Ya we don't reeally have include-what-you-use tho some sorta warnings I think
exist for a few STL types.
Right, if it's in the .h u can skip it in the .cc

+
 #include "content/public/common/associated_interface_provider.h"
 #include "content/public/renderer/render_frame.h"
 
 namespace content {
 
 using ::blink::mojom::ScreenOrientationLockResult;
 
 ScreenOrientationDispatcher::ScreenOrientationDispatcher(
     RenderFrame* render_frame)
     : RenderFrameObserver(render_frame) {
@@ skipping 41 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) {
+    std::unique_ptr<blink::WebLockOrientationCallback> callback) {
   CancelPendingLocks();
 
-  int request_id = pending_callbacks_.Add(callback);
+  int request_id = pending_callbacks_.Add(std::move(callback));
   EnsureScreenOrientationService();
   screen_orientation_->LockOrientation(
       orientation,
       base::Bind(&ScreenOrientationDispatcher::OnLockOrientationResult,
                  base::Unretained(this), request_id));
 }
 
 void ScreenOrientationDispatcher::unlockOrientation() {
   CancelPendingLocks();
   EnsureScreenOrientationService();
   screen_orientation_->UnlockOrientation();
 }
 
 void ScreenOrientationDispatcher::EnsureScreenOrientationService() {
   if (!screen_orientation_) {
     render_frame()->GetRemoteAssociatedInterfaces()->GetInterface(
         &screen_orientation_);
   }
 }
 
 int ScreenOrientationDispatcher::GetRequestIdForTests() {
   if (pending_callbacks_.IsEmpty())
     return -1;
   CallbackMap::Iterator<blink::WebLockOrientationCallback> iterator(
       &pending_callbacks_);
   return iterator.GetCurrentKey();
 }
 
 }  // namespace content