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

Unified Diff: remoting/host/client_session_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/client_session.cc ('k') | remoting/host/clipboard.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/client_session_unittest.cc
diff --git a/remoting/host/client_session_unittest.cc b/remoting/host/client_session_unittest.cc
index 32da050c048e0e1e396097af5c3e47199689656f..3ef301a85987d0180973726ead7936374af7306b 100644
--- a/remoting/host/client_session_unittest.cc
+++ b/remoting/host/client_session_unittest.cc
@@ -132,13 +132,13 @@ class ClientSessionTest : public testing::Test {
std::vector<HostExtension*> extensions_;
// ClientSession instance under test.
- scoped_ptr<ClientSession> client_session_;
+ std::unique_ptr<ClientSession> client_session_;
// ClientSession::EventHandler mock for use in tests.
MockClientSessionEventHandler session_event_handler_;
// Storage for values to be returned by the protocol::Session mock.
- scoped_ptr<SessionConfig> session_config_;
+ std::unique_ptr<SessionConfig> session_config_;
const std::string client_jid_;
// Stubs returned to |client_session_| components by |connection_|.
@@ -147,7 +147,7 @@ class ClientSessionTest : public testing::Test {
// ClientSession owns |connection_| but tests need it to inject fake events.
protocol::FakeConnectionToClient* connection_;
- scoped_ptr<FakeDesktopEnvironmentFactory> desktop_environment_factory_;
+ std::unique_ptr<FakeDesktopEnvironmentFactory> desktop_environment_factory_;
};
void ClientSessionTest::SetUp() {
@@ -174,13 +174,13 @@ void ClientSessionTest::TearDown() {
void ClientSessionTest::CreateClientSession() {
// Mock protocol::Session APIs called directly by ClientSession.
- scoped_ptr<protocol::MockSession> session(new MockSession());
+ std::unique_ptr<protocol::MockSession> session(new MockSession());
EXPECT_CALL(*session, config()).WillRepeatedly(ReturnRef(*session_config_));
EXPECT_CALL(*session, jid()).WillRepeatedly(ReturnRef(client_jid_));
// Mock protocol::ConnectionToClient APIs called directly by ClientSession.
// HostStub is not touched by ClientSession, so we can safely pass nullptr.
- scoped_ptr<protocol::FakeConnectionToClient> connection(
+ std::unique_ptr<protocol::FakeConnectionToClient> connection(
new protocol::FakeConnectionToClient(std::move(session)));
connection->set_client_stub(&client_stub_);
connection_ = connection.get();
« no previous file with comments | « remoting/host/client_session.cc ('k') | remoting/host/clipboard.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698