| Index: net/socket/ssl_client_socket_unittest.cc
|
| diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc
|
| index 1cd72102fb27e9598cb90c390c8aeb7f6be86adb..a32d5df68bf4837744277bcf0551a046a7de2895 100644
|
| --- a/net/socket/ssl_client_socket_unittest.cc
|
| +++ b/net/socket/ssl_client_socket_unittest.cc
|
| @@ -320,8 +320,8 @@ TEST_F(SSLClientSocketTest, Read) {
|
| EXPECT_TRUE(sock->IsConnected());
|
|
|
| const char request_text[] = "GET / HTTP/1.0\r\n\r\n";
|
| - scoped_refptr<net::IOBuffer> request_buffer =
|
| - new net::IOBuffer(arraysize(request_text) - 1);
|
| + scoped_refptr<net::IOBuffer> request_buffer(
|
| + new net::IOBuffer(arraysize(request_text) - 1));
|
| memcpy(request_buffer->data(), request_text, arraysize(request_text) - 1);
|
|
|
| rv = sock->Write(request_buffer, arraysize(request_text) - 1, &callback);
|
| @@ -331,7 +331,7 @@ TEST_F(SSLClientSocketTest, Read) {
|
| rv = callback.WaitForResult();
|
| EXPECT_EQ(static_cast<int>(arraysize(request_text) - 1), rv);
|
|
|
| - scoped_refptr<net::IOBuffer> buf = new net::IOBuffer(4096);
|
| + scoped_refptr<net::IOBuffer> buf(new net::IOBuffer(4096));
|
| for (;;) {
|
| rv = sock->Read(buf, 4096, &callback);
|
| EXPECT_TRUE(rv >= 0 || rv == net::ERR_IO_PENDING);
|
| @@ -381,7 +381,7 @@ TEST_F(SSLClientSocketTest, Read_FullDuplex) {
|
| EXPECT_TRUE(sock->IsConnected());
|
|
|
| // Issue a "hanging" Read first.
|
| - scoped_refptr<net::IOBuffer> buf = new net::IOBuffer(4096);
|
| + scoped_refptr<net::IOBuffer> buf(new net::IOBuffer(4096));
|
| rv = sock->Read(buf, 4096, &callback);
|
| // We haven't written the request, so there should be no response yet.
|
| ASSERT_EQ(net::ERR_IO_PENDING, rv);
|
| @@ -394,8 +394,8 @@ TEST_F(SSLClientSocketTest, Read_FullDuplex) {
|
| for (int i = 0; i < 3800; ++i)
|
| request_text.push_back('*');
|
| request_text.append("\r\n\r\n");
|
| - scoped_refptr<net::IOBuffer> request_buffer =
|
| - new net::StringIOBuffer(request_text);
|
| + scoped_refptr<net::IOBuffer> request_buffer(
|
| + new net::StringIOBuffer(request_text));
|
|
|
| rv = sock->Write(request_buffer, request_text.size(), &callback2);
|
| EXPECT_TRUE(rv >= 0 || rv == net::ERR_IO_PENDING);
|
| @@ -438,8 +438,8 @@ TEST_F(SSLClientSocketTest, Read_SmallChunks) {
|
| }
|
|
|
| const char request_text[] = "GET / HTTP/1.0\r\n\r\n";
|
| - scoped_refptr<net::IOBuffer> request_buffer =
|
| - new net::IOBuffer(arraysize(request_text) - 1);
|
| + scoped_refptr<net::IOBuffer> request_buffer(
|
| + new net::IOBuffer(arraysize(request_text) - 1));
|
| memcpy(request_buffer->data(), request_text, arraysize(request_text) - 1);
|
|
|
| rv = sock->Write(request_buffer, arraysize(request_text) - 1, &callback);
|
| @@ -449,7 +449,7 @@ TEST_F(SSLClientSocketTest, Read_SmallChunks) {
|
| rv = callback.WaitForResult();
|
| EXPECT_EQ(static_cast<int>(arraysize(request_text) - 1), rv);
|
|
|
| - scoped_refptr<net::IOBuffer> buf = new net::IOBuffer(1);
|
| + scoped_refptr<net::IOBuffer> buf(new net::IOBuffer(1));
|
| for (;;) {
|
| rv = sock->Read(buf, 1, &callback);
|
| EXPECT_TRUE(rv >= 0 || rv == net::ERR_IO_PENDING);
|
| @@ -492,8 +492,8 @@ TEST_F(SSLClientSocketTest, Read_Interrupted) {
|
| }
|
|
|
| const char request_text[] = "GET / HTTP/1.0\r\n\r\n";
|
| - scoped_refptr<net::IOBuffer> request_buffer =
|
| - new net::IOBuffer(arraysize(request_text) - 1);
|
| + scoped_refptr<net::IOBuffer> request_buffer(
|
| + new net::IOBuffer(arraysize(request_text) - 1));
|
| memcpy(request_buffer->data(), request_text, arraysize(request_text) - 1);
|
|
|
| rv = sock->Write(request_buffer, arraysize(request_text) - 1, &callback);
|
| @@ -504,7 +504,7 @@ TEST_F(SSLClientSocketTest, Read_Interrupted) {
|
| EXPECT_EQ(static_cast<int>(arraysize(request_text) - 1), rv);
|
|
|
| // Do a partial read and then exit. This test should not crash!
|
| - scoped_refptr<net::IOBuffer> buf = new net::IOBuffer(512);
|
| + scoped_refptr<net::IOBuffer> buf(new net::IOBuffer(512));
|
| rv = sock->Read(buf, 512, &callback);
|
| EXPECT_TRUE(rv > 0 || rv == net::ERR_IO_PENDING);
|
|
|
|
|