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

Unified Diff: remoting/protocol/v1_authenticator_unittest.cc

Issue 9240033: Use scoped_ptr<>.Pass() to pass ownership in the remoting protocol code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: - Created 8 years, 11 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
Index: remoting/protocol/v1_authenticator_unittest.cc
diff --git a/remoting/protocol/v1_authenticator_unittest.cc b/remoting/protocol/v1_authenticator_unittest.cc
index 772661dd5cf97e37012e3272aa88e40cf3ce63da..4869ddd8dcd9338db4e371beee0a23792c225b72 100644
--- a/remoting/protocol/v1_authenticator_unittest.cc
+++ b/remoting/protocol/v1_authenticator_unittest.cc
@@ -87,7 +87,7 @@ class V1AuthenticatorTest : public testing::Test {
// Pass message from client to host.
ASSERT_EQ(Authenticator::MESSAGE_READY, client_->state());
- message.reset(client_->GetNextMessage());
+ message = client_->GetNextMessage();
ASSERT_TRUE(message.get());
ASSERT_NE(Authenticator::MESSAGE_READY, client_->state());
@@ -103,7 +103,7 @@ class V1AuthenticatorTest : public testing::Test {
// Pass message from host to client.
ASSERT_EQ(Authenticator::MESSAGE_READY, host_->state());
- message.reset(host_->GetNextMessage());
+ message = host_->GetNextMessage();
ASSERT_TRUE(message.get());
ASSERT_NE(Authenticator::MESSAGE_READY, host_->state());
@@ -177,8 +177,8 @@ TEST_F(V1AuthenticatorTest, SuccessfulAuth) {
ASSERT_EQ(Authenticator::ACCEPTED, host_->state());
ASSERT_EQ(Authenticator::ACCEPTED, client_->state());
- client_auth_.reset(client_->CreateChannelAuthenticator());
- host_auth_.reset(host_->CreateChannelAuthenticator());
+ client_auth_ = client_->CreateChannelAuthenticator();
+ host_auth_ = host_->CreateChannelAuthenticator();
RunChannelAuth(false);
EXPECT_TRUE(client_socket_.get() != NULL);

Powered by Google App Engine
This is Rietveld 408576698