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

Unified Diff: remoting/protocol/channel_multiplexer_unittest.cc

Issue 15782010: Update remoting/ and jingle/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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/protocol/channel_multiplexer.cc ('k') | remoting/protocol/connection_tester.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/channel_multiplexer_unittest.cc
diff --git a/remoting/protocol/channel_multiplexer_unittest.cc b/remoting/protocol/channel_multiplexer_unittest.cc
index 94a5d47b5be917cd15cafe57d1f7795860839fdd..ea1ad09ae885a291cafd5c3218d1a6c3d6f7e6ea 100644
--- a/remoting/protocol/channel_multiplexer_unittest.cc
+++ b/remoting/protocol/channel_multiplexer_unittest.cc
@@ -256,10 +256,16 @@ TEST_F(ChannelMultiplexerTest, WriteFailSync) {
EXPECT_CALL(cb2, OnDone(_))
.Times(0);
- EXPECT_EQ(net::ERR_FAILED, host_socket1_->Write(buf, buf->size(), base::Bind(
- &MockSocketCallback::OnDone, base::Unretained(&cb1))));
- EXPECT_EQ(net::ERR_FAILED, host_socket2_->Write(buf, buf->size(), base::Bind(
- &MockSocketCallback::OnDone, base::Unretained(&cb2))));
+ EXPECT_EQ(net::ERR_FAILED,
+ host_socket1_->Write(buf.get(),
+ buf->size(),
+ base::Bind(&MockSocketCallback::OnDone,
+ base::Unretained(&cb1))));
+ EXPECT_EQ(net::ERR_FAILED,
+ host_socket2_->Write(buf.get(),
+ buf->size(),
+ base::Bind(&MockSocketCallback::OnDone,
+ base::Unretained(&cb2))));
message_loop_.RunUntilIdle();
}
@@ -286,11 +292,15 @@ TEST_F(ChannelMultiplexerTest, WriteFailAsync) {
EXPECT_CALL(cb2, OnDone(net::ERR_FAILED));
EXPECT_EQ(net::ERR_IO_PENDING,
- host_socket1_->Write(buf, buf->size(), base::Bind(
- &MockSocketCallback::OnDone, base::Unretained(&cb1))));
+ host_socket1_->Write(buf.get(),
+ buf->size(),
+ base::Bind(&MockSocketCallback::OnDone,
+ base::Unretained(&cb1))));
EXPECT_EQ(net::ERR_IO_PENDING,
- host_socket2_->Write(buf, buf->size(), base::Bind(
- &MockSocketCallback::OnDone, base::Unretained(&cb2))));
+ host_socket2_->Write(buf.get(),
+ buf->size(),
+ base::Bind(&MockSocketCallback::OnDone,
+ base::Unretained(&cb2))));
message_loop_.RunUntilIdle();
}
@@ -321,11 +331,15 @@ TEST_F(ChannelMultiplexerTest, DeleteWhenFailed) {
.WillOnce(InvokeWithoutArgs(this, &ChannelMultiplexerTest::DeleteAll));
EXPECT_EQ(net::ERR_IO_PENDING,
- host_socket1_->Write(buf, buf->size(), base::Bind(
- &MockSocketCallback::OnDone, base::Unretained(&cb1))));
+ host_socket1_->Write(buf.get(),
+ buf->size(),
+ base::Bind(&MockSocketCallback::OnDone,
+ base::Unretained(&cb1))));
EXPECT_EQ(net::ERR_IO_PENDING,
- host_socket2_->Write(buf, buf->size(), base::Bind(
- &MockSocketCallback::OnDone, base::Unretained(&cb2))));
+ host_socket2_->Write(buf.get(),
+ buf->size(),
+ base::Bind(&MockSocketCallback::OnDone,
+ base::Unretained(&cb2))));
message_loop_.RunUntilIdle();
« no previous file with comments | « remoting/protocol/channel_multiplexer.cc ('k') | remoting/protocol/connection_tester.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698