Index: net/http/http_proxy_client_socket_pool_spdy3_unittest.cc |
diff --git a/net/http/http_proxy_client_socket_pool_spdy3_unittest.cc b/net/http/http_proxy_client_socket_pool_spdy3_unittest.cc |
index d052b4f1b3eef2b59fae8c58d31bd8c0985aa56f..f26af33b402d61a3e23c537cc2a5e5ef5a3b0017 100644 |
--- a/net/http/http_proxy_client_socket_pool_spdy3_unittest.cc |
+++ b/net/http/http_proxy_client_socket_pool_spdy3_unittest.cc |
@@ -154,12 +154,13 @@ class HttpProxyClientSocketPoolSpdy3Test : public TestWithHttpParam { |
MockWrite* writes, size_t writes_count, |
MockRead* spdy_reads, size_t spdy_reads_count, |
MockWrite* spdy_writes, size_t spdy_writes_count) { |
- if (GetParam() == SPDY) |
- data_ = new DeterministicSocketData(spdy_reads, spdy_reads_count, |
- spdy_writes, spdy_writes_count); |
- else |
- data_ = new DeterministicSocketData(reads, reads_count, writes, |
- writes_count); |
+ if (GetParam() == SPDY) { |
+ data_.reset(new DeterministicSocketData(spdy_reads, spdy_reads_count, |
+ spdy_writes, spdy_writes_count)); |
+ } else { |
+ data_.reset(new DeterministicSocketData(reads, reads_count, writes, |
+ writes_count)); |
+ } |
data_->set_connect_data(MockConnect(SYNCHRONOUS, OK)); |
data_->StopAfter(2); // Request / Response |
@@ -217,7 +218,7 @@ class HttpProxyClientSocketPoolSpdy3Test : public TestWithHttpParam { |
protected: |
scoped_ptr<SSLSocketDataProvider> ssl_data_; |
- scoped_refptr<DeterministicSocketData> data_; |
+ scoped_ptr<DeterministicSocketData> data_; |
HttpProxyClientSocketPool pool_; |
ClientSocketHandle handle_; |
TestCompletionCallback callback_; |
@@ -385,7 +386,7 @@ TEST_P(HttpProxyClientSocketPoolSpdy3Test, AsyncHaveAuth) { |
TEST_P(HttpProxyClientSocketPoolSpdy3Test, TCPError) { |
if (GetParam() == SPDY) return; |
- data_ = new DeterministicSocketData(NULL, 0, NULL, 0); |
+ data_.reset(new DeterministicSocketData(NULL, 0, NULL, 0)); |
data_->set_connect_data(MockConnect(ASYNC, ERR_CONNECTION_CLOSED)); |
socket_factory().AddSocketDataProvider(data_.get()); |
@@ -404,7 +405,7 @@ TEST_P(HttpProxyClientSocketPoolSpdy3Test, TCPError) { |
TEST_P(HttpProxyClientSocketPoolSpdy3Test, SSLError) { |
if (GetParam() == HTTP) return; |
- data_ = new DeterministicSocketData(NULL, 0, NULL, 0); |
+ data_.reset(new DeterministicSocketData(NULL, 0, NULL, 0)); |
data_->set_connect_data(MockConnect(ASYNC, OK)); |
socket_factory().AddSocketDataProvider(data_.get()); |
@@ -429,7 +430,7 @@ TEST_P(HttpProxyClientSocketPoolSpdy3Test, SSLError) { |
TEST_P(HttpProxyClientSocketPoolSpdy3Test, SslClientAuth) { |
if (GetParam() == HTTP) return; |
- data_ = new DeterministicSocketData(NULL, 0, NULL, 0); |
+ data_.reset(new DeterministicSocketData(NULL, 0, NULL, 0)); |
data_->set_connect_data(MockConnect(ASYNC, OK)); |
socket_factory().AddSocketDataProvider(data_.get()); |