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

Unified Diff: remoting/host/desktop_process_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/desktop_process_main.cc ('k') | remoting/host/desktop_resizer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/desktop_process_unittest.cc
diff --git a/remoting/host/desktop_process_unittest.cc b/remoting/host/desktop_process_unittest.cc
index 1cde44e6eab7f8f890c481855cc4148807c82802..15da5e0456d6b023d837ad82e540fb0340c42986 100644
--- a/remoting/host/desktop_process_unittest.cc
+++ b/remoting/host/desktop_process_unittest.cc
@@ -150,7 +150,7 @@ class DesktopProcessTest : public testing::Test {
protected:
// The daemon's end of the daemon-to-desktop channel.
- scoped_ptr<IPC::ChannelProxy> daemon_channel_;
+ std::unique_ptr<IPC::ChannelProxy> daemon_channel_;
// Delegate that is passed to |daemon_channel_|.
MockDaemonListener daemon_listener_;
@@ -161,7 +161,7 @@ class DesktopProcessTest : public testing::Test {
scoped_refptr<AutoThreadTaskRunner> io_task_runner_;
// The network's end of the network-to-desktop channel.
- scoped_ptr<IPC::ChannelProxy> network_channel_;
+ std::unique_ptr<IPC::ChannelProxy> network_channel_;
// Delegate that is passed to |network_channel_|.
MockNetworkListener network_listener_;
@@ -269,7 +269,7 @@ void DesktopProcessTest::RunDesktopProcess() {
IPC::ChannelHandle(channel_name), IPC::Channel::MODE_SERVER,
&daemon_listener_, io_task_runner_.get());
- scoped_ptr<MockDesktopEnvironmentFactory> desktop_environment_factory(
+ std::unique_ptr<MockDesktopEnvironmentFactory> desktop_environment_factory(
new MockDesktopEnvironmentFactory());
EXPECT_CALL(*desktop_environment_factory, CreatePtr())
.Times(AnyNumber())
« no previous file with comments | « remoting/host/desktop_process_main.cc ('k') | remoting/host/desktop_resizer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698