Chromium Code Reviews Chromium Code Reviews
Issue 1298253002:
Remove reference counting from HttpNetworkSession. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master| Index: net/http/http_network_transaction_unittest.cc |
| diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc |
| index accad7da16fc38fe9be8d00e0f6394985b61992b..2bcef52e245f1f3c0a9e89a4c8b3f071f478cb8a 100644 |
| --- a/net/http/http_network_transaction_unittest.cc |
| +++ b/net/http/http_network_transaction_unittest.cc |
| @@ -230,7 +230,8 @@ void AddWebSocketHeaders(HttpRequestHeaders* headers) { |
| headers->SetHeader("Sec-WebSocket-Key", "dGhlIHNhbXBsZSBub25jZQ=="); |
| } |
| -HttpNetworkSession* CreateSession(SpdySessionDependencies* session_deps) { |
| +scoped_ptr<HttpNetworkSession> CreateSession( |
| + SpdySessionDependencies* session_deps) { |
| return SpdySessionDependencies::SpdyCreateSession(session_deps); |
| } |
| @@ -324,7 +325,7 @@ class HttpNetworkTransactionTest |
| BoundTestNetLog log; |
| session_deps_.net_log = log.bound().net_log(); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -661,7 +662,7 @@ bool CheckNTLMServerAuth(const AuthChallengeInfo* auth_challenge) { |
| } // namespace |
| TEST_P(HttpNetworkTransactionTest, Basic) { |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| } |
| @@ -980,7 +981,7 @@ TEST_P(HttpNetworkTransactionTest, TwoIdenticalLocationHeaders) { |
| request.url = GURL("http://redirect.com/"); |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -1025,7 +1026,7 @@ TEST_P(HttpNetworkTransactionTest, Head) { |
| request.url = GURL("http://www.example.org/"); |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| BeforeProxyHeadersSentHandler proxy_headers_handler; |
| @@ -1085,7 +1086,7 @@ TEST_P(HttpNetworkTransactionTest, Head) { |
| } |
| TEST_P(HttpNetworkTransactionTest, ReuseConnection) { |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| MockRead data_reads[] = { |
| MockRead("HTTP/1.1 200 OK\r\nContent-Length: 5\r\n\r\n"), |
| @@ -1143,7 +1144,7 @@ TEST_P(HttpNetworkTransactionTest, Ignores100) { |
| request.upload_data_stream = &upload_data_stream; |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -1185,7 +1186,7 @@ TEST_P(HttpNetworkTransactionTest, Ignores1xx) { |
| request.url = GURL("http://www.foo.com/"); |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -1224,7 +1225,7 @@ TEST_P(HttpNetworkTransactionTest, Incomplete100ThenEOF) { |
| request.url = GURL("http://www.foo.com/"); |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -1255,7 +1256,7 @@ TEST_P(HttpNetworkTransactionTest, EmptyResponse) { |
| request.url = GURL("http://www.foo.com/"); |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -1284,7 +1285,7 @@ void HttpNetworkTransactionTest::KeepAliveConnectionResendRequestTest( |
| TestNetLog net_log; |
| session_deps_.net_log = &net_log; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| // Written data for successfully sending both requests. |
| MockWrite data1_writes[] = { |
| @@ -1374,7 +1375,7 @@ void HttpNetworkTransactionTest::PreconnectErrorResendRequestTest( |
| TestNetLog net_log; |
| session_deps_.net_log = &net_log; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| SSLSocketDataProvider ssl1(ASYNC, OK); |
| SSLSocketDataProvider ssl2(ASYNC, OK); |
| @@ -1570,7 +1571,7 @@ TEST_P(HttpNetworkTransactionTest, NonKeepAliveConnectionReset) { |
| request.url = GURL("http://www.example.org/"); |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -1620,7 +1621,7 @@ TEST_P(HttpNetworkTransactionTest, ThrottleBeforeNetworkStart) { |
| request.url = GURL("http://www.example.org/"); |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -1669,7 +1670,7 @@ TEST_P(HttpNetworkTransactionTest, ThrottleAndCancelBeforeNetworkStart) { |
| request.url = GURL("http://www.example.org/"); |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -1700,7 +1701,7 @@ TEST_P(HttpNetworkTransactionTest, KeepAliveEarlyClose) { |
| request.url = GURL("http://www.example.org/"); |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -1741,7 +1742,7 @@ TEST_P(HttpNetworkTransactionTest, KeepAliveEarlyClose2) { |
| request.url = GURL("http://www.example.org/"); |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -1783,7 +1784,7 @@ TEST_P(HttpNetworkTransactionTest, KeepAliveAfterUnreadBody) { |
| TestNetLog net_log; |
| session_deps_.net_log = &net_log; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| // Note that because all these reads happen in the same |
| // StaticSocketDataProvider, it shows that the same socket is being reused for |
| @@ -1892,7 +1893,7 @@ TEST_P(HttpNetworkTransactionTest, BasicAuth) { |
| TestNetLog log; |
| session_deps_.net_log = &log; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -1993,7 +1994,7 @@ TEST_P(HttpNetworkTransactionTest, DoNotSendAuth) { |
| request.url = GURL("http://www.example.org/"); |
| request.load_flags = LOAD_DO_NOT_SEND_AUTH_DATA; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -2042,7 +2043,7 @@ TEST_P(HttpNetworkTransactionTest, BasicAuthKeepAlive) { |
| TestNetLog log; |
| session_deps_.net_log = &log; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| MockWrite data_writes1[] = { |
| MockWrite( |
| @@ -2142,7 +2143,7 @@ TEST_P(HttpNetworkTransactionTest, BasicAuthKeepAliveNoBody) { |
| request.url = GURL("http://www.example.org/"); |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| MockWrite data_writes1[] = { |
| MockWrite( |
| @@ -2220,7 +2221,7 @@ TEST_P(HttpNetworkTransactionTest, BasicAuthKeepAliveLargeBody) { |
| request.url = GURL("http://www.example.org/"); |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| MockWrite data_writes1[] = { |
| MockWrite( |
| @@ -2306,7 +2307,7 @@ TEST_P(HttpNetworkTransactionTest, BasicAuthKeepAliveImpatientServer) { |
| request.url = GURL("http://www.example.org/"); |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| MockWrite data_writes1[] = { |
| MockWrite( |
| @@ -2401,7 +2402,7 @@ TEST_P(HttpNetworkTransactionTest, BasicAuthProxyNoKeepAliveHttp10) { |
| ProxyService::CreateFixedFromPacResult("PROXY myproxy:70")); |
| BoundTestNetLog log; |
| session_deps_.net_log = log.bound().net_log(); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| // Since we have proxy, should try to establish tunnel. |
| MockWrite data_writes1[] = { |
| @@ -2525,7 +2526,7 @@ TEST_P(HttpNetworkTransactionTest, BasicAuthProxyNoKeepAliveHttp11) { |
| ProxyService::CreateFixedFromPacResult("PROXY myproxy:70")); |
| BoundTestNetLog log; |
| session_deps_.net_log = log.bound().net_log(); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| // Since we have proxy, should try to establish tunnel. |
| MockWrite data_writes1[] = { |
| @@ -2649,7 +2650,7 @@ TEST_P(HttpNetworkTransactionTest, BasicAuthProxyKeepAliveHttp10) { |
| session_deps_.proxy_service.reset(ProxyService::CreateFixed("myproxy:70")); |
| BoundTestNetLog log; |
| session_deps_.net_log = log.bound().net_log(); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -2756,7 +2757,7 @@ TEST_P(HttpNetworkTransactionTest, BasicAuthProxyKeepAliveHttp11) { |
| session_deps_.proxy_service.reset(ProxyService::CreateFixed("myproxy:70")); |
| BoundTestNetLog log; |
| session_deps_.net_log = log.bound().net_log(); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -2860,7 +2861,7 @@ TEST_P(HttpNetworkTransactionTest, BasicAuthProxyKeepAliveHangupDuringBody) { |
| // Configure against proxy server "myproxy:70". |
| session_deps_.proxy_service.reset(ProxyService::CreateFixed("myproxy:70")); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session = CreateSession(&session_deps_); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -2950,7 +2951,7 @@ TEST_P(HttpNetworkTransactionTest, BasicAuthProxyCancelTunnel) { |
| // Configure against proxy server "myproxy:70". |
| session_deps_.proxy_service.reset(ProxyService::CreateFixed("myproxy:70")); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -3010,7 +3011,7 @@ TEST_P(HttpNetworkTransactionTest, SanitizeProxyAuthHeaders) { |
| // Configure against proxy server "myproxy:70". |
| session_deps_.proxy_service.reset(ProxyService::CreateFixed("myproxy:70")); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -3071,7 +3072,7 @@ TEST_P(HttpNetworkTransactionTest, UnexpectedProxyAuth) { |
| request.load_flags = 0; |
| // We are using a DIRECT connection (i.e. no proxy) for this session. |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -3119,7 +3120,7 @@ TEST_P(HttpNetworkTransactionTest, |
| session_deps_.proxy_service.reset(ProxyService::CreateFixed("myproxy:70")); |
| BoundTestNetLog log; |
| session_deps_.net_log = log.bound().net_log(); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| // Since we have proxy, should try to establish tunnel. |
| MockWrite data_writes1[] = { |
| @@ -3185,7 +3186,7 @@ TEST_P(HttpNetworkTransactionTest, HttpProxyLoadTimingNoPacTwoRequests) { |
| ProxyService::CreateFixed("PROXY myproxy:70")); |
| BoundTestNetLog log; |
| session_deps_.net_log = log.bound().net_log(); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| // Since we have proxy, should try to establish tunnel. |
| MockWrite data_writes1[] = { |
| @@ -3286,7 +3287,7 @@ TEST_P(HttpNetworkTransactionTest, HttpProxyLoadTimingWithPacTwoRequests) { |
| ProxyService::CreateFixedFromPacResult("PROXY myproxy:70")); |
| BoundTestNetLog log; |
| session_deps_.net_log = log.bound().net_log(); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| // Since we have proxy, should try to establish tunnel. |
| MockWrite data_writes1[] = { |
| @@ -3384,7 +3385,7 @@ TEST_P(HttpNetworkTransactionTest, HttpsProxyGet) { |
| "https://proxy:70")); |
| BoundTestNetLog log; |
| session_deps_.net_log = log.bound().net_log(); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| // Since we have proxy, should use full url |
| MockWrite data_writes1[] = { |
| @@ -3447,7 +3448,7 @@ TEST_P(HttpNetworkTransactionTest, HttpsProxySpdyGet) { |
| "https://proxy:70")); |
| BoundTestNetLog log; |
| session_deps_.net_log = log.bound().net_log(); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| // fetch http://www.example.org/ via SPDY |
| scoped_ptr<SpdyFrame> req( |
| @@ -3508,7 +3509,7 @@ TEST_P(HttpNetworkTransactionTest, HttpsProxySpdyGetWithSessionRace) { |
| ProxyService::CreateFixed("https://proxy:70")); |
| BoundTestNetLog log; |
| session_deps_.net_log = log.bound().net_log(); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| // Fetch http://www.example.org/ through the SPDY proxy. |
| scoped_ptr<SpdyFrame> req( |
| @@ -3578,7 +3579,7 @@ TEST_P(HttpNetworkTransactionTest, HttpsProxySpdyGetWithProxyAuth) { |
| ProxyService::CreateFixed("https://myproxy:70")); |
| BoundTestNetLog log; |
| session_deps_.net_log = log.bound().net_log(); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| // The first request will be a bare GET, the second request will be a |
| // GET with a Proxy-Authorization header. |
| @@ -3679,7 +3680,7 @@ TEST_P(HttpNetworkTransactionTest, HttpsProxySpdyConnectHttps) { |
| "https://proxy:70")); |
| BoundTestNetLog log; |
| session_deps_.net_log = log.bound().net_log(); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -3764,7 +3765,7 @@ TEST_P(HttpNetworkTransactionTest, HttpsProxySpdyConnectSpdy) { |
| "https://proxy:70")); |
| BoundTestNetLog log; |
| session_deps_.net_log = log.bound().net_log(); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -3856,7 +3857,7 @@ TEST_P(HttpNetworkTransactionTest, HttpsProxySpdyConnectFailure) { |
| "https://proxy:70")); |
| BoundTestNetLog log; |
| session_deps_.net_log = log.bound().net_log(); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -3908,7 +3909,7 @@ TEST_P(HttpNetworkTransactionTest, |
| "https://proxy:70")); |
| BoundTestNetLog log; |
| session_deps_.net_log = log.bound().net_log(); |
| - scoped_refptr<HttpNetworkSession> session( |
| + scoped_ptr<HttpNetworkSession> session( |
| SpdySessionDependencies::SpdyCreateSession(&session_deps_)); |
| HttpRequestInfo request1; |
| @@ -4051,7 +4052,7 @@ TEST_P(HttpNetworkTransactionTest, |
| "https://proxy:70")); |
| BoundTestNetLog log; |
| session_deps_.net_log = log.bound().net_log(); |
| - scoped_refptr<HttpNetworkSession> session( |
| + scoped_ptr<HttpNetworkSession> session( |
| SpdySessionDependencies::SpdyCreateSession(&session_deps_)); |
| HttpRequestInfo request1; |
| @@ -4175,7 +4176,7 @@ TEST_P(HttpNetworkTransactionTest, HttpsProxySpdyLoadTimingTwoHttpRequests) { |
| "https://proxy:70")); |
| BoundTestNetLog log; |
| session_deps_.net_log = log.bound().net_log(); |
| - scoped_refptr<HttpNetworkSession> session( |
| + scoped_ptr<HttpNetworkSession> session( |
| SpdySessionDependencies::SpdyCreateSession(&session_deps_)); |
| HttpRequestInfo request1; |
| @@ -4282,7 +4283,7 @@ TEST_P(HttpNetworkTransactionTest, HttpsProxyAuthRetry) { |
| ProxyService::CreateFixed("https://myproxy:70")); |
| BoundTestNetLog log; |
| session_deps_.net_log = log.bound().net_log(); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| // Since we have proxy, should use full url |
| MockWrite data_writes1[] = { |
| @@ -4379,7 +4380,7 @@ void HttpNetworkTransactionTest::ConnectStatusHelperWithExpectedStatus( |
| // Configure against proxy server "myproxy:70". |
| session_deps_.proxy_service.reset(ProxyService::CreateFixed("myproxy:70")); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| // Since we have proxy, should try to establish tunnel. |
| MockWrite data_writes[] = { |
| @@ -4597,7 +4598,7 @@ TEST_P(HttpNetworkTransactionTest, BasicAuthProxyThenServer) { |
| // Configure against proxy server "myproxy:70". |
| session_deps_.proxy_service.reset(ProxyService::CreateFixed("myproxy:70")); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -4733,7 +4734,7 @@ TEST_P(HttpNetworkTransactionTest, NTLMAuth1) { |
| HttpAuthHandlerNTLM::ScopedProcSetter proc_setter(MockGenerateRandom1, |
| MockGetHostName); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| MockWrite data_writes1[] = { |
| MockWrite("GET /kids/login.aspx HTTP/1.1\r\n" |
| @@ -4862,7 +4863,7 @@ TEST_P(HttpNetworkTransactionTest, NTLMAuth2) { |
| HttpAuthHandlerNTLM::ScopedProcSetter proc_setter(MockGenerateRandom2, |
| MockGetHostName); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| MockWrite data_writes1[] = { |
| MockWrite("GET /kids/login.aspx HTTP/1.1\r\n" |
| @@ -5062,7 +5063,7 @@ TEST_P(HttpNetworkTransactionTest, LargeHeadersNoBody) { |
| request.url = GURL("http://www.example.org/"); |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -5101,7 +5102,7 @@ TEST_P(HttpNetworkTransactionTest, |
| // Configure against proxy server "myproxy:70". |
| session_deps_.proxy_service.reset(ProxyService::CreateFixed("myproxy:70")); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -5155,7 +5156,7 @@ TEST_P(HttpNetworkTransactionTest, RecycleSocket) { |
| request.url = GURL("http://www.example.org/"); |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -5234,7 +5235,7 @@ TEST_P(HttpNetworkTransactionTest, RecycleSSLSocket) { |
| TestCompletionCallback callback; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -5304,7 +5305,7 @@ TEST_P(HttpNetworkTransactionTest, RecycleDeadSSLSocket) { |
| TestCompletionCallback callback; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -5372,7 +5373,7 @@ TEST_P(HttpNetworkTransactionTest, RecycleSocketAfterZeroContentLength) { |
| "rt=prt.2642,ol.2649,xjs.2951"); |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -5438,7 +5439,7 @@ TEST_P(HttpNetworkTransactionTest, ResendRequestOnWriteBodyError) { |
| request[1].upload_data_stream = &upload_data_stream; |
| request[1].load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| // The first socket is used for transaction 1 and the first attempt of |
| // transaction 2. |
| @@ -5516,7 +5517,7 @@ TEST_P(HttpNetworkTransactionTest, AuthIdentityInURL) { |
| request.url = GURL("http://foo:b@r@www.example.org/"); |
| request.load_flags = LOAD_NORMAL; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -5599,7 +5600,7 @@ TEST_P(HttpNetworkTransactionTest, WrongAuthIdentityInURL) { |
| request.load_flags = LOAD_NORMAL; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -5710,7 +5711,7 @@ TEST_P(HttpNetworkTransactionTest, AuthIdentityInURLSuppressed) { |
| request.url = GURL("http://foo:bar@www.example.org/"); |
| request.load_flags = LOAD_DO_NOT_USE_EMBEDDED_IDENTITY; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -5784,7 +5785,7 @@ TEST_P(HttpNetworkTransactionTest, AuthIdentityInURLSuppressed) { |
| // Test that previously tried username/passwords for a realm get re-used. |
| TEST_P(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) { |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| // Transaction 1: authenticate (foo, bar) on MyRealm1 |
| { |
| @@ -6184,7 +6185,7 @@ TEST_P(HttpNetworkTransactionTest, DigestPreAuthNonceCount) { |
| new HttpAuthHandlerDigest::FixedNonceGenerator("0123456789abcdef"); |
| digest_factory->set_nonce_generator(nonce_generator); |
| session_deps_.http_auth_handler_factory.reset(digest_factory); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| // Transaction 1: authenticate (foo, bar) on MyRealm1 |
| { |
| @@ -6316,7 +6317,7 @@ TEST_P(HttpNetworkTransactionTest, DigestPreAuthNonceCount) { |
| // Test the ResetStateForRestart() private method. |
| TEST_P(HttpNetworkTransactionTest, ResetStateForRestart) { |
| // Create a transaction (the dependencies aren't important). |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpNetworkTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -6363,7 +6364,7 @@ TEST_P(HttpNetworkTransactionTest, HTTPSBadCertificate) { |
| request.url = GURL("https://www.example.org/"); |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -6471,7 +6472,7 @@ TEST_P(HttpNetworkTransactionTest, HTTPSBadCertificateViaProxy) { |
| for (int i = 0; i < 2; i++) { |
| session_deps_.socket_factory->ResetNextMockIndexes(); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -6537,7 +6538,7 @@ TEST_P(HttpNetworkTransactionTest, HTTPSViaHttpsProxy) { |
| TestCompletionCallback callback; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -6596,7 +6597,7 @@ TEST_P(HttpNetworkTransactionTest, RedirectOfHttpsConnectViaHttpsProxy) { |
| TestCompletionCallback callback; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -6678,7 +6679,7 @@ TEST_P(HttpNetworkTransactionTest, RedirectOfHttpsConnectViaSpdyProxy) { |
| TestCompletionCallback callback; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -6731,7 +6732,7 @@ TEST_P(HttpNetworkTransactionTest, |
| TestCompletionCallback callback; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -6789,7 +6790,7 @@ TEST_P(HttpNetworkTransactionTest, |
| TestCompletionCallback callback; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -6816,7 +6817,7 @@ TEST_P(HttpNetworkTransactionTest, BasicAuthSpdyProxy) { |
| ProxyService::CreateFixedFromPacResult("HTTPS myproxy:70")); |
| BoundTestNetLog log; |
| session_deps_.net_log = log.bound().net_log(); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| // Since we have proxy, should try to establish tunnel. |
| scoped_ptr<SpdyFrame> req(spdy_util_.ConstructSpdyConnect( |
| @@ -6961,7 +6962,7 @@ TEST_P(HttpNetworkTransactionTest, CrossOriginProxyPush) { |
| // Enable cross-origin push. |
| session_deps_.trusted_spdy_proxy = "myproxy:70"; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<SpdyFrame> stream1_syn( |
| spdy_util_.ConstructSpdyGet(NULL, 0, false, 1, LOWEST, false)); |
| @@ -7075,7 +7076,7 @@ TEST_P(HttpNetworkTransactionTest, CrossOriginProxyPushCorrectness) { |
| // Enable cross-origin push. |
| session_deps_.trusted_spdy_proxy = "myproxy:70"; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<SpdyFrame> stream1_syn( |
| spdy_util_.ConstructSpdyGet(NULL, 0, false, 1, LOWEST, false)); |
| @@ -7204,7 +7205,7 @@ TEST_P(HttpNetworkTransactionTest, HTTPSBadCertificateViaHttpsProxy) { |
| TestCompletionCallback callback; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -7233,7 +7234,7 @@ TEST_P(HttpNetworkTransactionTest, BuildRequest_UserAgent) { |
| request.extra_headers.SetHeader(HttpRequestHeaders::kUserAgent, |
| "Chromium Ultra Awesome X Edition"); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -7274,7 +7275,7 @@ TEST_P(HttpNetworkTransactionTest, BuildRequest_UserAgentOverTunnel) { |
| "Chromium Ultra Awesome X Edition"); |
| session_deps_.proxy_service.reset(ProxyService::CreateFixed("myproxy:70")); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -7314,7 +7315,7 @@ TEST_P(HttpNetworkTransactionTest, BuildRequest_Referer) { |
| request.extra_headers.SetHeader(HttpRequestHeaders::kReferer, |
| "http://the.previous.site.com/"); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -7352,7 +7353,7 @@ TEST_P(HttpNetworkTransactionTest, BuildRequest_PostContentLengthZero) { |
| request.method = "POST"; |
| request.url = GURL("http://www.example.org/"); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -7390,7 +7391,7 @@ TEST_P(HttpNetworkTransactionTest, BuildRequest_PutContentLengthZero) { |
| request.method = "PUT"; |
| request.url = GURL("http://www.example.org/"); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -7428,7 +7429,7 @@ TEST_P(HttpNetworkTransactionTest, BuildRequest_HeadContentLengthZero) { |
| request.method = "HEAD"; |
| request.url = GURL("http://www.example.org/"); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -7465,7 +7466,7 @@ TEST_P(HttpNetworkTransactionTest, BuildRequest_CacheControlNoCache) { |
| request.url = GURL("http://www.example.org/"); |
| request.load_flags = LOAD_BYPASS_CACHE; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -7506,7 +7507,7 @@ TEST_P(HttpNetworkTransactionTest, |
| request.url = GURL("http://www.example.org/"); |
| request.load_flags = LOAD_VALIDATE_CACHE; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -7545,7 +7546,7 @@ TEST_P(HttpNetworkTransactionTest, BuildRequest_ExtraHeaders) { |
| request.url = GURL("http://www.example.org/"); |
| request.extra_headers.SetHeader("FooHeader", "Bar"); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -7586,7 +7587,7 @@ TEST_P(HttpNetworkTransactionTest, BuildRequest_ExtraHeadersStripped) { |
| request.extra_headers.SetHeader("hEllo", "Kitty"); |
| request.extra_headers.SetHeader("FoO", "bar"); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -7632,7 +7633,7 @@ TEST_P(HttpNetworkTransactionTest, SOCKS4_HTTP_GET) { |
| TestNetLog net_log; |
| session_deps_.net_log = &net_log; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -7691,7 +7692,7 @@ TEST_P(HttpNetworkTransactionTest, SOCKS4_SSL_GET) { |
| TestNetLog net_log; |
| session_deps_.net_log = &net_log; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -7755,7 +7756,7 @@ TEST_P(HttpNetworkTransactionTest, SOCKS4_HTTP_GET_no_PAC) { |
| TestNetLog net_log; |
| session_deps_.net_log = &net_log; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -7814,7 +7815,7 @@ TEST_P(HttpNetworkTransactionTest, SOCKS5_HTTP_GET) { |
| TestNetLog net_log; |
| session_deps_.net_log = &net_log; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -7886,7 +7887,7 @@ TEST_P(HttpNetworkTransactionTest, SOCKS5_SSL_GET) { |
| TestNetLog net_log; |
| session_deps_.net_log = &net_log; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -7963,10 +7964,10 @@ struct GroupNameTest { |
| bool ssl; |
| }; |
| -scoped_refptr<HttpNetworkSession> SetupSessionForGroupNameTests( |
| +scoped_ptr<HttpNetworkSession> SetupSessionForGroupNameTests( |
| NextProto next_proto, |
| SpdySessionDependencies* session_deps_) { |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(session_deps_)); |
| base::WeakPtr<HttpServerProperties> http_server_properties = |
| session->http_server_properties(); |
| @@ -7980,9 +7981,8 @@ scoped_refptr<HttpNetworkSession> SetupSessionForGroupNameTests( |
| return session; |
| } |
| -int GroupNameTransactionHelper( |
| - const std::string& url, |
| - const scoped_refptr<HttpNetworkSession>& session) { |
| +int GroupNameTransactionHelper(const std::string& url, |
| + const scoped_ptr<HttpNetworkSession>& session) { |
|
pauljensen
2015/09/02 14:32:29
This should be a raw pointer. Passing scoped_ptr'
mmenke
2015/09/02 16:29:34
Yikes! That was a careless mistake when doing mas
|
| HttpRequestInfo request; |
| request.method = "GET"; |
| request.url = GURL(url); |
| @@ -8040,10 +8040,10 @@ TEST_P(HttpNetworkTransactionTest, GroupNameForDirectConnections) { |
| for (size_t i = 0; i < arraysize(tests); ++i) { |
| session_deps_.proxy_service.reset( |
| ProxyService::CreateFixed(tests[i].proxy_server)); |
| - scoped_refptr<HttpNetworkSession> session( |
| + scoped_ptr<HttpNetworkSession> session( |
| SetupSessionForGroupNameTests(GetParam(), &session_deps_)); |
| - HttpNetworkSessionPeer peer(session); |
| + HttpNetworkSessionPeer peer(session.get()); |
| CaptureGroupNameTransportSocketPool* transport_conn_pool = |
| new CaptureGroupNameTransportSocketPool(NULL, NULL); |
| CaptureGroupNameSSLSocketPool* ssl_conn_pool = |
| @@ -8102,10 +8102,10 @@ TEST_P(HttpNetworkTransactionTest, GroupNameForHTTPProxyConnections) { |
| for (size_t i = 0; i < arraysize(tests); ++i) { |
| session_deps_.proxy_service.reset( |
| ProxyService::CreateFixed(tests[i].proxy_server)); |
| - scoped_refptr<HttpNetworkSession> session( |
| + scoped_ptr<HttpNetworkSession> session( |
| SetupSessionForGroupNameTests(GetParam(), &session_deps_)); |
| - HttpNetworkSessionPeer peer(session); |
| + HttpNetworkSessionPeer peer(session.get()); |
| HostPortPair proxy_host("http_proxy", 80); |
| CaptureGroupNameHttpProxySocketPool* http_proxy_pool = |
| @@ -8172,10 +8172,10 @@ TEST_P(HttpNetworkTransactionTest, GroupNameForSOCKSConnections) { |
| for (size_t i = 0; i < arraysize(tests); ++i) { |
| session_deps_.proxy_service.reset( |
| ProxyService::CreateFixed(tests[i].proxy_server)); |
| - scoped_refptr<HttpNetworkSession> session( |
| + scoped_ptr<HttpNetworkSession> session( |
| SetupSessionForGroupNameTests(GetParam(), &session_deps_)); |
| - HttpNetworkSessionPeer peer(session); |
| + HttpNetworkSessionPeer peer(session.get()); |
| HostPortPair proxy_host("socks_proxy", 1080); |
| CaptureGroupNameSOCKSSocketPool* socks_conn_pool = |
| @@ -8215,7 +8215,7 @@ TEST_P(HttpNetworkTransactionTest, ReconsiderProxyAfterFailedConnection) { |
| // connecting to both proxies (myproxy:70 and foobar:80). |
| session_deps_.host_resolver->rules()->AddSimulatedFailure("*"); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -8241,7 +8241,7 @@ void HttpNetworkTransactionTest::BypassHostCacheOnRefreshHelper( |
| // Select a host resolver that does caching. |
| session_deps_.host_resolver.reset(new MockCachingHostResolver); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -8310,7 +8310,7 @@ TEST_P(HttpNetworkTransactionTest, RequestWriteError) { |
| StaticSocketDataProvider data(NULL, 0, |
| write_failure, arraysize(write_failure)); |
| session_deps_.socket_factory->AddSocketDataProvider(&data); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| TestCompletionCallback callback; |
| @@ -8338,7 +8338,7 @@ TEST_P(HttpNetworkTransactionTest, ConnectionClosedAfterStartOfHeaders) { |
| StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0); |
| session_deps_.socket_factory->AddSocketDataProvider(&data); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| TestCompletionCallback callback; |
| @@ -8412,7 +8412,7 @@ TEST_P(HttpNetworkTransactionTest, DrainResetOK) { |
| StaticSocketDataProvider data2(data_reads2, arraysize(data_reads2), |
| data_writes2, arraysize(data_writes2)); |
| session_deps_.socket_factory->AddSocketDataProvider(&data2); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| TestCompletionCallback callback1; |
| @@ -8468,7 +8468,7 @@ TEST_P(HttpNetworkTransactionTest, HTTPSViaProxyWithExtraData) { |
| session_deps_.socket_factory->ResetNextMockIndexes(); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -8485,7 +8485,7 @@ TEST_P(HttpNetworkTransactionTest, LargeContentLengthThenClose) { |
| request.url = GURL("http://www.example.org/"); |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -8534,7 +8534,7 @@ TEST_P(HttpNetworkTransactionTest, UploadFileSmallerThanLength) { |
| request.upload_data_stream = &upload_data_stream; |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -8589,7 +8589,7 @@ TEST_P(HttpNetworkTransactionTest, UploadUnreadableFile) { |
| request.load_flags = 0; |
| // If we try to upload an unreadable file, the transaction should fail. |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -8643,7 +8643,7 @@ TEST_P(HttpNetworkTransactionTest, CancelDuringInitRequestBody) { |
| request.upload_data_stream = &upload_data_stream; |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -8750,7 +8750,7 @@ TEST_P(HttpNetworkTransactionTest, ChangeAuthRealms) { |
| TestCompletionCallback callback1; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -8845,7 +8845,7 @@ TEST_P(HttpNetworkTransactionTest, HonorAlternativeServiceHeader) { |
| TestCompletionCallback callback; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -8909,7 +8909,7 @@ TEST_P(HttpNetworkTransactionTest, DoNotHonorAlternativeServiceHeader) { |
| TestCompletionCallback callback; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session = CreateSession(&session_deps_); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -8966,7 +8966,7 @@ TEST_P(HttpNetworkTransactionTest, HonorMultipleAlternativeServiceHeader) { |
| TestCompletionCallback callback; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -9033,7 +9033,7 @@ TEST_P(HttpNetworkTransactionTest, HonorAlternateProtocolHeader) { |
| TestCompletionCallback callback; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -9090,7 +9090,7 @@ TEST_P(HttpNetworkTransactionTest, EmptyAlternateProtocolHeader) { |
| TestCompletionCallback callback; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| HostPortPair http_host_port_pair("www.example.org", 80); |
| HttpServerProperties& http_server_properties = |
| @@ -9157,7 +9157,7 @@ TEST_P(HttpNetworkTransactionTest, AltSvcOverwritesAlternateProtocol) { |
| TestCompletionCallback callback; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -9216,7 +9216,7 @@ TEST_P(HttpNetworkTransactionTest, DisableAlternativeServiceToDifferentHost) { |
| nullptr, 0); |
| session_deps_.socket_factory->AddSocketDataProvider(&second_data); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session = CreateSession(&session_deps_); |
| base::WeakPtr<HttpServerProperties> http_server_properties = |
| session->http_server_properties(); |
| @@ -9260,7 +9260,7 @@ TEST_P(HttpNetworkTransactionTest, |
| data_reads, arraysize(data_reads), NULL, 0); |
| session_deps_.socket_factory->AddSocketDataProvider(&second_data); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| base::WeakPtr<HttpServerProperties> http_server_properties = |
| session->http_server_properties(); |
| @@ -9326,7 +9326,7 @@ TEST_P(HttpNetworkTransactionTest, |
| data_reads, arraysize(data_reads), NULL, 0); |
| session_deps_.socket_factory->AddSocketDataProvider(&second_data); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| base::WeakPtr<HttpServerProperties> http_server_properties = |
| session->http_server_properties(); |
| @@ -9378,7 +9378,7 @@ TEST_P(HttpNetworkTransactionTest, |
| data_reads, arraysize(data_reads), NULL, 0); |
| session_deps_.socket_factory->AddSocketDataProvider(&second_data); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| base::WeakPtr<HttpServerProperties> http_server_properties = |
| session->http_server_properties(); |
| @@ -9429,7 +9429,7 @@ TEST_P(HttpNetworkTransactionTest, |
| data_reads, arraysize(data_reads), NULL, 0); |
| session_deps_.socket_factory->AddSocketDataProvider(&second_data); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| base::WeakPtr<HttpServerProperties> http_server_properties = |
| session->http_server_properties(); |
| @@ -9481,7 +9481,7 @@ TEST_P(HttpNetworkTransactionTest, |
| data_reads, arraysize(data_reads), NULL, 0); |
| session_deps_.socket_factory->AddSocketDataProvider(&second_data); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| base::WeakPtr<HttpServerProperties> http_server_properties = |
| session->http_server_properties(); |
| @@ -9532,7 +9532,7 @@ TEST_P(HttpNetworkTransactionTest, |
| data_reads, arraysize(data_reads), NULL, 0); |
| session_deps_.socket_factory->AddSocketDataProvider(&second_data); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| base::WeakPtr<HttpServerProperties> http_server_properties = |
| session->http_server_properties(); |
| @@ -9578,7 +9578,7 @@ TEST_P(HttpNetworkTransactionTest, AlternateProtocolUnsafeBlocked) { |
| data_reads, arraysize(data_reads), NULL, 0); |
| session_deps_.socket_factory->AddSocketDataProvider(&data); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| base::WeakPtr<HttpServerProperties> http_server_properties = |
| session->http_server_properties(); |
| @@ -9663,7 +9663,7 @@ TEST_P(HttpNetworkTransactionTest, UseAlternateProtocolForNpnSpdy) { |
| TestCompletionCallback callback; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -9765,7 +9765,7 @@ TEST_P(HttpNetworkTransactionTest, AlternateProtocolWithSpdyLateBinding) { |
| // Socket 5 is the unsuccessful non-Alternate-Protocol for transaction 3. |
| session_deps_.socket_factory->AddSocketDataProvider(&hanging_socket); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| TestCompletionCallback callback1; |
| HttpNetworkTransaction trans1(DEFAULT_PRIORITY, session.get()); |
| @@ -9856,7 +9856,7 @@ TEST_P(HttpNetworkTransactionTest, StallAlternateProtocolForNpnSpdy) { |
| TestCompletionCallback callback; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -10020,7 +10020,7 @@ TEST_P(HttpNetworkTransactionTest, |
| TestCompletionCallback callback; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -10113,7 +10113,7 @@ TEST_P(HttpNetworkTransactionTest, |
| TestCompletionCallback callback; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -10505,7 +10505,7 @@ TEST_P(HttpNetworkTransactionTest, GenerateAuthToken) { |
| request.url = GURL(test_config.server_url); |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| HttpNetworkTransaction trans(DEFAULT_PRIORITY, session.get()); |
| SSLSocketDataProvider ssl_socket_data_provider(SYNCHRONOUS, OK); |
| @@ -10604,12 +10604,12 @@ TEST_P(HttpNetworkTransactionTest, MultiRoundAuth) { |
| request.url = origin; |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| // Use a TCP Socket Pool with only one connection per group. This is used |
| // to validate that the TCP socket is not released to the pool between |
| // each round of multi-round authentication. |
| - HttpNetworkSessionPeer session_peer(session); |
| + HttpNetworkSessionPeer session_peer(session.get()); |
| TransportClientSocketPool* transport_pool = new TransportClientSocketPool( |
| 50, // Max sockets for pool |
| 1, // Max sockets per group |
| @@ -10804,7 +10804,7 @@ TEST_P(HttpNetworkTransactionTest, NpnWithHttpOverSSL) { |
| TestCompletionCallback callback; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -10856,7 +10856,7 @@ TEST_P(HttpNetworkTransactionTest, SpdyPostNPNServerHangup) { |
| TestCompletionCallback callback; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -11010,7 +11010,7 @@ TEST_P(HttpNetworkTransactionTest, SpdyAlternateProtocolThroughProxy) { |
| session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl); |
| session_deps_.socket_factory->AddSocketDataProvider( |
| &hanging_non_alternate_protocol_socket); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| // First round should work and provide the Alternate-Protocol state. |
| TestCompletionCallback callback_1; |
| @@ -11070,7 +11070,7 @@ TEST_P(HttpNetworkTransactionTest, SimpleCancel) { |
| request.load_flags = 0; |
| session_deps_.host_resolver->set_synchronous_mode(true); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -11108,7 +11108,7 @@ TEST_P(HttpNetworkTransactionTest, CancelAfterHeaders) { |
| StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0); |
| session_deps_.socket_factory->AddSocketDataProvider(&data); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| { |
| HttpRequestInfo request; |
| @@ -11144,7 +11144,7 @@ TEST_P(HttpNetworkTransactionTest, ProxyGet) { |
| ProxyService::CreateFixedFromPacResult("PROXY myproxy:70")); |
| BoundTestNetLog log; |
| session_deps_.net_log = log.bound().net_log(); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| HttpRequestInfo request; |
| request.method = "GET"; |
| @@ -11208,7 +11208,7 @@ TEST_P(HttpNetworkTransactionTest, ProxyTunnelGet) { |
| ProxyService::CreateFixedFromPacResult("PROXY myproxy:70")); |
| BoundTestNetLog log; |
| session_deps_.net_log = log.bound().net_log(); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| HttpRequestInfo request; |
| request.method = "GET"; |
| @@ -11285,7 +11285,7 @@ TEST_P(HttpNetworkTransactionTest, ProxyTunnelGetHangup) { |
| session_deps_.proxy_service.reset(ProxyService::CreateFixed("myproxy:70")); |
| BoundTestNetLog log; |
| session_deps_.net_log = log.bound().net_log(); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| HttpRequestInfo request; |
| request.method = "GET"; |
| @@ -11357,7 +11357,7 @@ TEST_P(HttpNetworkTransactionTest, PreconnectWithExistingSpdySession) { |
| ssl.SetNextProto(GetParam()); |
| session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| // Set up an initial SpdySession in the pool to reuse. |
| HostPortPair host_port_pair("www.example.org", 443); |
| @@ -11400,7 +11400,7 @@ void HttpNetworkTransactionTest::CheckErrorIsPassedBack( |
| session_deps_.socket_factory->AddSocketDataProvider(&data); |
| session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl_data); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -11487,7 +11487,7 @@ TEST_P(HttpNetworkTransactionTest, |
| StaticSocketDataProvider data4(NULL, 0, NULL, 0); |
| session_deps_.socket_factory->AddSocketDataProvider(&data4); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -11604,7 +11604,7 @@ TEST_P(HttpNetworkTransactionTest, |
| StaticSocketDataProvider data5(data2_reads, arraysize(data2_reads), NULL, 0); |
| session_deps_.socket_factory->AddSocketDataProvider(&data5); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -11697,7 +11697,7 @@ TEST_P(HttpNetworkTransactionTest, ClientAuthCertCache_Proxy_Fail) { |
| for (size_t i = 0; i < arraysize(requests); ++i) { |
| session_deps_.socket_factory->ResetNextMockIndexes(); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpNetworkTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -11750,7 +11750,7 @@ TEST_P(HttpNetworkTransactionTest, UseIPConnectionPooling) { |
| // Set up a special HttpNetworkSession with a MockCachingHostResolver. |
| session_deps_.host_resolver.reset(new MockCachingHostResolver()); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| SpdySessionPoolPeer pool_peer(session->spdy_session_pool()); |
| pool_peer.DisableDomainAuthenticationVerification(); |
| @@ -11849,7 +11849,7 @@ TEST_P(HttpNetworkTransactionTest, UseIPConnectionPoolingAfterResolution) { |
| // Set up a special HttpNetworkSession with a MockCachingHostResolver. |
| session_deps_.host_resolver.reset(new MockCachingHostResolver()); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| SpdySessionPoolPeer pool_peer(session->spdy_session_pool()); |
| pool_peer.DisableDomainAuthenticationVerification(); |
| @@ -11979,7 +11979,7 @@ TEST_P(HttpNetworkTransactionTest, |
| HttpNetworkSession::Params params = |
| SpdySessionDependencies::CreateSessionParams(&session_deps_); |
| params.host_resolver = &host_resolver; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| SpdySessionPoolPeer pool_peer(session->spdy_session_pool()); |
| pool_peer.DisableDomainAuthenticationVerification(); |
| @@ -12119,7 +12119,7 @@ TEST_P(HttpNetworkTransactionTest, DoNotUseSpdySessionForHttp) { |
| session_deps_.socket_factory->AddSocketDataProvider(&data1); |
| session_deps_.socket_factory->AddSocketDataProvider(&data2); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| // Start the first transaction to set up the SpdySession |
| HttpRequestInfo request1; |
| @@ -12231,7 +12231,7 @@ class AltSvcCertificateVerificationTest : public HttpNetworkTransactionTest { |
| session_deps_.socket_factory->AddSocketDataProvider(&data_refused); |
| session_deps_.use_alternative_services = true; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| base::WeakPtr<HttpServerProperties> http_server_properties = |
| session->http_server_properties(); |
| AlternativeService alternative_service( |
| @@ -12335,7 +12335,7 @@ TEST_P(HttpNetworkTransactionTest, AlternativeServiceNotOnHttp11) { |
| // Set up alternative service for origin. |
| session_deps_.use_alternative_services = true; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| base::WeakPtr<HttpServerProperties> http_server_properties = |
| session->http_server_properties(); |
| AlternativeService alternative_service( |
| @@ -12408,7 +12408,7 @@ TEST_P(HttpNetworkTransactionTest, FailedAlternativeServiceIsNotUserVisible) { |
| // Set up alternative service for origin. |
| session_deps_.use_alternative_services = true; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| base::WeakPtr<HttpServerProperties> http_server_properties = |
| session->http_server_properties(); |
| AlternativeService alternative_service( |
| @@ -12517,7 +12517,7 @@ TEST_P(HttpNetworkTransactionTest, AlternativeServiceShouldNotPoolToHttp11) { |
| // Set up alternative service for origin. |
| session_deps_.use_alternative_services = true; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| base::WeakPtr<HttpServerProperties> http_server_properties = |
| session->http_server_properties(); |
| AlternativeService alternative_service( |
| @@ -12651,7 +12651,7 @@ TEST_P(HttpNetworkTransactionTest, DoNotUseSpdySessionForHttpOverTunnel) { |
| session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl2); |
| session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data1); |
| - scoped_refptr<HttpNetworkSession> session( |
| + scoped_ptr<HttpNetworkSession> session( |
| SpdySessionDependencies::SpdyCreateSessionDeterministic(&session_deps_)); |
| // Start the first transaction to set up the SpdySession |
| @@ -12785,7 +12785,7 @@ TEST_P(HttpNetworkTransactionTest, DoNotUseSpdySessionIfCertDoesNotMatch) { |
| session_deps_.host_resolver->rules()->AddRule("news.example.org", ip_addr); |
| session_deps_.host_resolver->rules()->AddRule("proxy", ip_addr); |
| - scoped_refptr<HttpNetworkSession> session( |
| + scoped_ptr<HttpNetworkSession> session( |
| SpdySessionDependencies::SpdyCreateSessionDeterministic(&session_deps_)); |
| // Start the first transaction to set up the SpdySession |
| @@ -12860,7 +12860,7 @@ TEST_P(HttpNetworkTransactionTest, ErrorSocketNotConnected) { |
| session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl2); |
| session_deps_.socket_factory->AddSocketDataProvider(&data2); |
| - scoped_refptr<HttpNetworkSession> session( |
| + scoped_ptr<HttpNetworkSession> session( |
| SpdySessionDependencies::SpdyCreateSession(&session_deps_)); |
| // Start the first transaction to set up the SpdySession and verify that |
| @@ -12899,7 +12899,7 @@ TEST_P(HttpNetworkTransactionTest, CloseIdleSpdySessionToOpenNewOne) { |
| // Use two different hosts with different IPs so they don't get pooled. |
| session_deps_.host_resolver->rules()->AddRule("www.a.com", "10.0.0.1"); |
| session_deps_.host_resolver->rules()->AddRule("www.b.com", "10.0.0.2"); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| SSLSocketDataProvider ssl1(ASYNC, OK); |
| ssl1.SetNextProto(GetParam()); |
| @@ -13059,7 +13059,7 @@ TEST_P(HttpNetworkTransactionTest, HttpSyncConnectError) { |
| request.url = GURL("http://www.example.org/"); |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -13092,7 +13092,7 @@ TEST_P(HttpNetworkTransactionTest, HttpAsyncConnectError) { |
| request.url = GURL("http://www.example.org/"); |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -13125,7 +13125,7 @@ TEST_P(HttpNetworkTransactionTest, HttpSyncWriteError) { |
| request.url = GURL("http://www.example.org/"); |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -13159,7 +13159,7 @@ TEST_P(HttpNetworkTransactionTest, HttpAsyncWriteError) { |
| request.url = GURL("http://www.example.org/"); |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -13193,7 +13193,7 @@ TEST_P(HttpNetworkTransactionTest, HttpSyncReadError) { |
| request.url = GURL("http://www.example.org/"); |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -13230,7 +13230,7 @@ TEST_P(HttpNetworkTransactionTest, HttpAsyncReadError) { |
| request.url = GURL("http://www.example.org/"); |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -13268,7 +13268,7 @@ TEST_P(HttpNetworkTransactionTest, GetFullRequestHeadersIncludesExtraHeader) { |
| request.load_flags = 0; |
| request.extra_headers.SetHeader("X-Foo", "bar"); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -13666,8 +13666,8 @@ class FakeWebSocketStreamCreateHelper : |
| // Make sure that HttpNetworkTransaction passes on its priority to its |
| // stream request on start. |
| TEST_P(HttpNetworkTransactionTest, SetStreamRequestPriorityOnStart) { |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| - HttpNetworkSessionPeer peer(session); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + HttpNetworkSessionPeer peer(session.get()); |
| FakeStreamFactory* fake_factory = new FakeStreamFactory(); |
| peer.SetHttpStreamFactory(scoped_ptr<HttpStreamFactory>(fake_factory)); |
| @@ -13689,8 +13689,8 @@ TEST_P(HttpNetworkTransactionTest, SetStreamRequestPriorityOnStart) { |
| // Make sure that HttpNetworkTransaction passes on its priority |
| // updates to its stream request. |
| TEST_P(HttpNetworkTransactionTest, SetStreamRequestPriority) { |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| - HttpNetworkSessionPeer peer(session); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + HttpNetworkSessionPeer peer(session.get()); |
| FakeStreamFactory* fake_factory = new FakeStreamFactory(); |
| peer.SetHttpStreamFactory(scoped_ptr<HttpStreamFactory>(fake_factory)); |
| @@ -13714,8 +13714,8 @@ TEST_P(HttpNetworkTransactionTest, SetStreamRequestPriority) { |
| // Make sure that HttpNetworkTransaction passes on its priority |
| // updates to its stream. |
| TEST_P(HttpNetworkTransactionTest, SetStreamPriority) { |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| - HttpNetworkSessionPeer peer(session); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + HttpNetworkSessionPeer peer(session.get()); |
| FakeStreamFactory* fake_factory = new FakeStreamFactory(); |
| peer.SetHttpStreamFactory(scoped_ptr<HttpStreamFactory>(fake_factory)); |
| @@ -13744,8 +13744,8 @@ TEST_P(HttpNetworkTransactionTest, CreateWebSocketHandshakeStream) { |
| std::string test_cases[] = {"ws://www.example.org/", |
| "wss://www.example.org/"}; |
| for (size_t i = 0; i < arraysize(test_cases); ++i) { |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| - HttpNetworkSessionPeer peer(session); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + HttpNetworkSessionPeer peer(session.get()); |
| FakeStreamFactory* fake_factory = new FakeStreamFactory(); |
| FakeWebSocketStreamCreateHelper websocket_stream_create_helper; |
| peer.SetHttpStreamFactoryForWebSocket( |
| @@ -13826,7 +13826,7 @@ TEST_P(HttpNetworkTransactionTest, CloseSSLSocketOnIdleForHttpRequest) { |
| http_writes, arraysize(http_writes)); |
| session_deps_.socket_factory->AddSocketDataProvider(&http_data); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| // Start the SSL request. |
| TestCompletionCallback ssl_callback; |
| @@ -13908,7 +13908,7 @@ TEST_P(HttpNetworkTransactionTest, CloseSSLSocketOnIdleForHttpRequest2) { |
| http_writes, arraysize(http_writes)); |
| session_deps_.socket_factory->AddSocketDataProvider(&http_data); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| // Preconnect an SSL socket. A preconnect is needed because connect jobs are |
| // cancelled when a normal transaction is cancelled. |
| @@ -13949,7 +13949,7 @@ TEST_P(HttpNetworkTransactionTest, PostReadsErrorResponseAfterReset) { |
| request.upload_data_stream = &upload_data_stream; |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| // Send headers successfully, but get an error while sending the body. |
| @@ -13994,7 +13994,7 @@ TEST_P(HttpNetworkTransactionTest, PostReadsErrorResponseAfterReset) { |
| // response from a server that rejected a POST with a CONNECTION_RESET. |
| TEST_P(HttpNetworkTransactionTest, |
| PostReadsErrorResponseAfterResetOnReusedSocket) { |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| MockWrite data_writes[] = { |
| MockWrite("GET / HTTP/1.1\r\n" |
| "Host: www.foo.com\r\n" |
| @@ -14088,7 +14088,7 @@ TEST_P(HttpNetworkTransactionTest, |
| request.upload_data_stream = &upload_data_stream; |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| // Send headers successfully, but get an error while sending the body. |
| @@ -14143,7 +14143,7 @@ TEST_P(HttpNetworkTransactionTest, ChunkedPostReadsErrorResponseAfterReset) { |
| request.upload_data_stream = &upload_data_stream; |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| // Send headers successfully, but get an error while sending the body. |
| @@ -14202,7 +14202,7 @@ TEST_P(HttpNetworkTransactionTest, PostReadsErrorResponseAfterResetAnd100) { |
| request.upload_data_stream = &upload_data_stream; |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| @@ -14255,7 +14255,7 @@ TEST_P(HttpNetworkTransactionTest, PostIgnoresNonErrorResponseAfterReset) { |
| request.upload_data_stream = &upload_data_stream; |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| // Send headers successfully, but get an error while sending the body. |
| @@ -14297,7 +14297,7 @@ TEST_P(HttpNetworkTransactionTest, |
| request.upload_data_stream = &upload_data_stream; |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| // Send headers successfully, but get an error while sending the body. |
| @@ -14340,7 +14340,7 @@ TEST_P(HttpNetworkTransactionTest, PostIgnoresHttp09ResponseAfterReset) { |
| request.upload_data_stream = &upload_data_stream; |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| // Send headers successfully, but get an error while sending the body. |
| @@ -14380,7 +14380,7 @@ TEST_P(HttpNetworkTransactionTest, PostIgnoresPartial400HeadersAfterReset) { |
| request.upload_data_stream = &upload_data_stream; |
| request.load_flags = 0; |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| scoped_ptr<HttpTransaction> trans( |
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
| // Send headers successfully, but get an error while sending the body. |
| @@ -14421,7 +14421,7 @@ TEST_P(HttpNetworkTransactionTest, ProxyHeadersNotSentOverWssTunnel) { |
| session_deps_.proxy_service.reset( |
| ProxyService::CreateFixedFromPacResult("PROXY myproxy:70")); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| // Since a proxy is configured, try to establish a tunnel. |
| MockWrite data_writes[] = { |
| @@ -14528,7 +14528,7 @@ TEST_P(HttpNetworkTransactionTest, ProxyHeadersNotSentOverWsTunnel) { |
| session_deps_.proxy_service.reset( |
| ProxyService::CreateFixedFromPacResult("PROXY myproxy:70")); |
| - scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| + scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_)); |
| MockWrite data_writes[] = { |
| // Try to establish a tunnel for the WebSocket connection, with |
