Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode.

components/test_runner/mock_screen_orientation_client.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 "components/test_runner/mock_screen_orientation_client.h"
 
+#include <memory>
+
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 
 namespace test_runner {
 
 MockScreenOrientationClient::MockScreenOrientationClient()
     : main_frame_(NULL),
@@ skipping 91 matching lines @@
       return current_lock_ ==
                  blink::WebScreenOrientationLockLandscapeSecondary ||
              current_lock_ == blink::WebScreenOrientationLockLandscape;
     default:
       return false;
   }
 }
 
 void MockScreenOrientationClient::lockOrientation(
     blink::WebScreenOrientationLockType orientation,
-    blink::WebLockOrientationCallback* callback) {
+    std::unique_ptr<blink::WebLockOrientationCallback> callback) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE, base::Bind(&MockScreenOrientationClient::UpdateLockSync,
-                            base::Unretained(this), orientation, callback));
+      FROM_HERE,
+      base::Bind(&MockScreenOrientationClient::UpdateLockSync,
+                 base::Unretained(this), orientation, base::Passed(&callback)));
 }
 
 void MockScreenOrientationClient::unlockOrientation() {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&MockScreenOrientationClient::ResetLockSync,
                             base::Unretained(this)));
 }
 
 void MockScreenOrientationClient::UpdateLockSync(
     blink::WebScreenOrientationLockType lock,
-    blink::WebLockOrientationCallback* callback) {
+    std::unique_ptr<blink::WebLockOrientationCallback> callback) {
   DCHECK(lock != blink::WebScreenOrientationLockDefault);
   current_lock_ = lock;
   if (!IsOrientationAllowedByCurrentLock(current_orientation_))
     UpdateScreenOrientation(SuitableOrientationForCurrentLock());
   callback->onSuccess();
-  delete callback;
 }
 
 void MockScreenOrientationClient::ResetLockSync() {
   bool will_screen_orientation_need_updating =
       !IsOrientationAllowedByCurrentLock(device_orientation_);
   current_lock_ = blink::WebScreenOrientationLockDefault;
   if (will_screen_orientation_need_updating)
     UpdateScreenOrientation(device_orientation_);
 }
 
 blink::WebScreenOrientationType
 MockScreenOrientationClient::SuitableOrientationForCurrentLock() {
   switch (current_lock_) {
     case blink::WebScreenOrientationLockPortraitSecondary:
       return blink::WebScreenOrientationPortraitSecondary;
     case blink::WebScreenOrientationLockLandscapePrimary:
     case blink::WebScreenOrientationLockLandscape:
       return blink::WebScreenOrientationLandscapePrimary;
     case blink::WebScreenOrientationLockLandscapeSecondary:
       return blink::WebScreenOrientationLandscapePrimary;
     default:
       return blink::WebScreenOrientationPortraitPrimary;
   }
 }
 
 }  // namespace test_runner