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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/spdy/spdy_proxy_client_socket_unittest.cc

Issue 15829004: Update net/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: license twerk 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 | « net/spdy/spdy_proxy_client_socket.cc ('k') | net/spdy/spdy_session.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_proxy_client_socket_unittest.cc
diff --git a/net/spdy/spdy_proxy_client_socket_unittest.cc b/net/spdy/spdy_proxy_client_socket_unittest.cc
index 252c8f5c6889355dbf0637386258a49ea5db9221..9c06f9ce464e7d54cb6f78a77e4336b8dbe233dc 100644
--- a/net/spdy/spdy_proxy_client_socket_unittest.cc
+++ b/net/spdy/spdy_proxy_client_socket_unittest.cc
@@ -165,7 +165,7 @@ SpdyProxyClientSocketTest::SpdyProxyClientSocketTest()
void SpdyProxyClientSocketTest::TearDown() {
sock_.reset(NULL);
- if (session_ != NULL)
+ if (session_.get() != NULL)
session_->spdy_session_pool()->CloseAllSessions();
// Empty the current queue.
@@ -249,7 +249,7 @@ void SpdyProxyClientSocketTest::AssertConnectionEstablished() {
void SpdyProxyClientSocketTest::AssertSyncReadEquals(const char* data,
int len) {
scoped_refptr<IOBuffer> buf(new IOBuffer(len));
- ASSERT_EQ(len, sock_->Read(buf, len, CompletionCallback()));
+ ASSERT_EQ(len, sock_->Read(buf.get(), len, CompletionCallback()));
ASSERT_EQ(std::string(data, len), std::string(buf->data(), len));
ASSERT_TRUE(sock_->IsConnected());
}
@@ -259,7 +259,8 @@ void SpdyProxyClientSocketTest::AssertAsyncReadEquals(const char* data,
data_->StopAfter(1);
// Issue the read, which will be completed asynchronously
scoped_refptr<IOBuffer> buf(new IOBuffer(len));
- ASSERT_EQ(ERR_IO_PENDING, sock_->Read(buf, len, read_callback_.callback()));
+ ASSERT_EQ(ERR_IO_PENDING,
+ sock_->Read(buf.get(), len, read_callback_.callback()));
EXPECT_TRUE(sock_->IsConnected());
data_->Run();
@@ -276,7 +277,7 @@ void SpdyProxyClientSocketTest::AssertReadStarts(const char* data,
// Issue the read, which will be completed asynchronously
read_buf_ = new IOBuffer(len);
ASSERT_EQ(ERR_IO_PENDING,
- sock_->Read(read_buf_, len, read_callback_.callback()));
+ sock_->Read(read_buf_.get(), len, read_callback_.callback()));
EXPECT_TRUE(sock_->IsConnected());
}
@@ -300,7 +301,8 @@ void SpdyProxyClientSocketTest::AssertWriteReturns(const char* data,
int len,
int rv) {
scoped_refptr<IOBufferWithSize> buf(CreateBuffer(data, len));
- EXPECT_EQ(rv, sock_->Write(buf, buf->size(), write_callback_.callback()));
+ EXPECT_EQ(rv,
+ sock_->Write(buf.get(), buf->size(), write_callback_.callback()));
}
void SpdyProxyClientSocketTest::AssertWriteLength(int len) {
@@ -311,8 +313,8 @@ void SpdyProxyClientSocketTest::AssertAsyncWriteWithReadsSucceeds(
const char* data, int len, int num_reads) {
scoped_refptr<IOBufferWithSize> buf(CreateBuffer(data, len));
- EXPECT_EQ(ERR_IO_PENDING, sock_->Write(buf, buf->size(),
- write_callback_.callback()));
+ EXPECT_EQ(ERR_IO_PENDING,
+ sock_->Write(buf.get(), buf->size(), write_callback_.callback()));
for (int i = 0; i < num_reads; i++) {
Run(1);
@@ -561,7 +563,7 @@ TEST_P(SpdyProxyClientSocketTest, ConnectRedirects) {
const HttpResponseInfo* response = sock_->GetConnectResponseInfo();
ASSERT_TRUE(response != NULL);
- const HttpResponseHeaders* headers = response->headers;
+ const HttpResponseHeaders* headers = response->headers.get();
ASSERT_EQ(302, headers->response_code());
ASSERT_FALSE(headers->HasHeader("set-cookie"));
ASSERT_TRUE(headers->HasHeaderValue("content-length", "0"));
@@ -699,8 +701,8 @@ TEST_P(SpdyProxyClientSocketTest, WriteSplitsLargeDataIntoMultipleFrames) {
scoped_refptr<IOBufferWithSize> buf(CreateBuffer(big_data.data(),
big_data.length()));
- EXPECT_EQ(ERR_IO_PENDING, sock_->Write(buf, buf->size(),
- write_callback_.callback()));
+ EXPECT_EQ(ERR_IO_PENDING,
+ sock_->Write(buf.get(), buf->size(), write_callback_.callback()));
data_->RunFor(3);
EXPECT_EQ(buf->size(), write_callback_.WaitForResult());
@@ -901,7 +903,7 @@ TEST_P(SpdyProxyClientSocketTest, MultipleReadsFromSameLargeFrame) {
// Now attempt to do a read of more data than remains buffered
scoped_refptr<IOBuffer> buf(new IOBuffer(kLen33));
- ASSERT_EQ(kLen3, sock_->Read(buf, kLen33, read_callback_.callback()));
+ ASSERT_EQ(kLen3, sock_->Read(buf.get(), kLen33, read_callback_.callback()));
ASSERT_EQ(std::string(kMsg3, kLen3), std::string(buf->data(), kLen3));
ASSERT_TRUE(sock_->IsConnected());
}
@@ -1127,7 +1129,7 @@ TEST_P(SpdyProxyClientSocketTest, ReadOnClosedSocketReturnsBufferedData) {
ASSERT_FALSE(sock_->IsConnected());
scoped_refptr<IOBuffer> buf(new IOBuffer(kLen1));
- ASSERT_EQ(kLen1, sock_->Read(buf, kLen1, CompletionCallback()));
+ ASSERT_EQ(kLen1, sock_->Read(buf.get(), kLen1, CompletionCallback()));
ASSERT_EQ(std::string(kMsg1, kLen1), std::string(buf->data(), kLen1));
ASSERT_EQ(0, sock_->Read(NULL, 1, CompletionCallback()));
@@ -1158,7 +1160,7 @@ TEST_P(SpdyProxyClientSocketTest, WriteOnClosedStream) {
Run(1); // Read EOF which will close the stream
scoped_refptr<IOBufferWithSize> buf(CreateBuffer(kMsg1, kLen1));
EXPECT_EQ(ERR_SOCKET_NOT_CONNECTED,
- sock_->Write(buf, buf->size(), CompletionCallback()));
+ sock_->Write(buf.get(), buf->size(), CompletionCallback()));
}
// Calling Write() on a disconnected socket is an error
@@ -1183,7 +1185,7 @@ TEST_P(SpdyProxyClientSocketTest, WriteOnDisconnectedSocket) {
scoped_refptr<IOBufferWithSize> buf(CreateBuffer(kMsg1, kLen1));
EXPECT_EQ(ERR_SOCKET_NOT_CONNECTED,
- sock_->Write(buf, buf->size(), CompletionCallback()));
+ sock_->Write(buf.get(), buf->size(), CompletionCallback()));
}
// If the socket is closed with a pending Write(), the callback
@@ -1209,7 +1211,7 @@ TEST_P(SpdyProxyClientSocketTest, WritePendingOnClose) {
scoped_refptr<IOBufferWithSize> buf(CreateBuffer(kMsg1, kLen1));
EXPECT_EQ(ERR_IO_PENDING,
- sock_->Write(buf, buf->size(), write_callback_.callback()));
+ sock_->Write(buf.get(), buf->size(), write_callback_.callback()));
Run(1);
@@ -1239,7 +1241,7 @@ TEST_P(SpdyProxyClientSocketTest, DisconnectWithWritePending) {
scoped_refptr<IOBufferWithSize> buf(CreateBuffer(kMsg1, kLen1));
EXPECT_EQ(ERR_IO_PENDING,
- sock_->Write(buf, buf->size(), write_callback_.callback()));
+ sock_->Write(buf.get(), buf->size(), write_callback_.callback()));
sock_->Disconnect();
@@ -1269,7 +1271,7 @@ TEST_P(SpdyProxyClientSocketTest, DisconnectWithReadPending) {
scoped_refptr<IOBuffer> buf(new IOBuffer(kLen1));
ASSERT_EQ(ERR_IO_PENDING,
- sock_->Read(buf, kLen1, read_callback_.callback()));
+ sock_->Read(buf.get(), kLen1, read_callback_.callback()));
sock_->Disconnect();
@@ -1302,12 +1304,13 @@ TEST_P(SpdyProxyClientSocketTest, RstWithReadAndWritePending) {
scoped_refptr<IOBuffer> read_buf(new IOBuffer(kLen1));
ASSERT_EQ(ERR_IO_PENDING,
- sock_->Read(read_buf, kLen1, read_callback_.callback()));
+ sock_->Read(read_buf.get(), kLen1, read_callback_.callback()));
scoped_refptr<IOBufferWithSize> write_buf(CreateBuffer(kMsg1, kLen1));
- EXPECT_EQ(ERR_IO_PENDING,
- sock_->Write(write_buf, write_buf->size(),
- write_callback_.callback()));
+ EXPECT_EQ(
+ ERR_IO_PENDING,
+ sock_->Write(
+ write_buf.get(), write_buf->size(), write_callback_.callback()));
Run(2);
@@ -1426,11 +1429,13 @@ TEST_P(SpdyProxyClientSocketTest, RstWithReadAndWritePendingDelete) {
scoped_refptr<IOBuffer> read_buf(new IOBuffer(kLen1));
ASSERT_EQ(ERR_IO_PENDING,
- sock_->Read(read_buf, kLen1, read_callback.callback()));
+ sock_->Read(read_buf.get(), kLen1, read_callback.callback()));
scoped_refptr<IOBufferWithSize> write_buf(CreateBuffer(kMsg1, kLen1));
- EXPECT_EQ(ERR_IO_PENDING, sock_->Write(write_buf, write_buf->size(),
- write_callback_.callback()));
+ EXPECT_EQ(
+ ERR_IO_PENDING,
+ sock_->Write(
+ write_buf.get(), write_buf->size(), write_callback_.callback()));
Run(2);
« no previous file with comments | « net/spdy/spdy_proxy_client_socket.cc ('k') | net/spdy/spdy_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698