Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(480)

Unified Diff: remoting/host/mouse_shape_pump_unittest.cc

Issue 1864213002: Convert //remoting to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac IWYU Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/mouse_shape_pump.cc ('k') | remoting/host/native_messaging/log_message_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/mouse_shape_pump_unittest.cc
diff --git a/remoting/host/mouse_shape_pump_unittest.cc b/remoting/host/mouse_shape_pump_unittest.cc
index cbc6a4d4d5d2aaa9da8bbb32280052f88bdac002..946635ee524cafafd6ad7aad09c79f567f7e9a36 100644
--- a/remoting/host/mouse_shape_pump_unittest.cc
+++ b/remoting/host/mouse_shape_pump_unittest.cc
@@ -7,6 +7,7 @@
#include <utility>
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
@@ -46,7 +47,7 @@ class TestMouseCursorMonitor : public webrtc::MouseCursorMonitor {
void Capture() override {
ASSERT_TRUE(callback_);
- scoped_ptr<webrtc::MouseCursor> mouse_cursor(new webrtc::MouseCursor(
+ std::unique_ptr<webrtc::MouseCursor> mouse_cursor(new webrtc::MouseCursor(
new webrtc::BasicDesktopFrame(
webrtc::DesktopSize(kCursorWidth, kCursorHeight)),
webrtc::DesktopVector(kHotspotX, kHotspotY)));
@@ -67,7 +68,7 @@ class MouseShapePumpTest : public testing::Test {
protected:
base::MessageLoop message_loop_;
base::RunLoop run_loop_;
- scoped_ptr<MouseShapePump> pump_;
+ std::unique_ptr<MouseShapePump> pump_;
MockClientStub client_stub_;
};
@@ -98,7 +99,7 @@ TEST_F(MouseShapePumpTest, FirstCursor) {
.RetiresOnSaturation();
// Start the pump.
- pump_.reset(new MouseShapePump(make_scoped_ptr(new TestMouseCursorMonitor()),
+ pump_.reset(new MouseShapePump(base::WrapUnique(new TestMouseCursorMonitor()),
&client_stub_));
run_loop_.Run();
« no previous file with comments | « remoting/host/mouse_shape_pump.cc ('k') | remoting/host/native_messaging/log_message_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698