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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_network_transaction_unittest.cc

Issue 1342613002: Revert of Remove reference counting from HttpNetworkSession. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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/http/http_network_transaction_ssl_unittest.cc ('k') | net/http/http_proxy_client_socket_pool_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 b89565319877cc17c5413c31c03f8a761f0e4815..25af22fabeebddd8ece2587a2d6518192ed6179f 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -232,8 +232,7 @@
headers->SetHeader("Sec-WebSocket-Key", "dGhlIHNhbXBsZSBub25jZQ==");
}
-scoped_ptr<HttpNetworkSession> CreateSession(
- SpdySessionDependencies* session_deps) {
+HttpNetworkSession* CreateSession(SpdySessionDependencies* session_deps) {
return SpdySessionDependencies::SpdyCreateSession(session_deps);
}
@@ -328,7 +327,7 @@
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -674,7 +673,7 @@
} // namespace
TEST_P(HttpNetworkTransactionTest, Basic) {
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
}
@@ -993,7 +992,7 @@
request.url = GURL("http://redirect.com/");
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -1038,7 +1037,7 @@
request.url = GURL("http://www.example.org/");
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
BeforeProxyHeadersSentHandler proxy_headers_handler;
@@ -1098,7 +1097,7 @@
}
TEST_P(HttpNetworkTransactionTest, ReuseConnection) {
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
MockRead data_reads[] = {
MockRead("HTTP/1.1 200 OK\r\nContent-Length: 5\r\n\r\n"),
@@ -1156,7 +1155,7 @@
request.upload_data_stream = &upload_data_stream;
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -1198,7 +1197,7 @@
request.url = GURL("http://www.foo.com/");
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -1237,7 +1236,7 @@
request.url = GURL("http://www.foo.com/");
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -1268,7 +1267,7 @@
request.url = GURL("http://www.foo.com/");
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -1297,7 +1296,7 @@
TestNetLog net_log;
session_deps_.net_log = &net_log;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
// Written data for successfully sending both requests.
MockWrite data1_writes[] = {
@@ -1387,7 +1386,7 @@
TestNetLog net_log;
session_deps_.net_log = &net_log;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
SSLSocketDataProvider ssl1(ASYNC, OK);
SSLSocketDataProvider ssl2(ASYNC, OK);
@@ -1583,7 +1582,7 @@
request.url = GURL("http://www.example.org/");
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -1633,7 +1632,7 @@
request.url = GURL("http://www.example.org/");
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -1682,7 +1681,7 @@
request.url = GURL("http://www.example.org/");
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -1713,7 +1712,7 @@
request.url = GURL("http://www.example.org/");
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -1754,7 +1753,7 @@
request.url = GURL("http://www.example.org/");
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -1796,7 +1795,7 @@
TestNetLog net_log;
session_deps_.net_log = &net_log;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<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
@@ -1905,7 +1904,7 @@
TestNetLog log;
session_deps_.net_log = &log;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -2010,7 +2009,7 @@
request.url = GURL("http://www.example.org/");
request.load_flags = LOAD_DO_NOT_SEND_AUTH_DATA;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -2061,7 +2060,7 @@
TestNetLog log;
session_deps_.net_log = &log;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
MockWrite data_writes1[] = {
MockWrite(
@@ -2164,7 +2163,7 @@
request.url = GURL("http://www.example.org/");
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
MockWrite data_writes1[] = {
MockWrite(
@@ -2242,7 +2241,7 @@
request.url = GURL("http://www.example.org/");
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
MockWrite data_writes1[] = {
MockWrite(
@@ -2328,7 +2327,7 @@
request.url = GURL("http://www.example.org/");
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
MockWrite data_writes1[] = {
MockWrite(
@@ -2423,7 +2422,7 @@
ProxyService::CreateFixedFromPacResult("PROXY myproxy:70"));
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
// Since we have proxy, should try to establish tunnel.
MockWrite data_writes1[] = {
@@ -2547,7 +2546,7 @@
ProxyService::CreateFixedFromPacResult("PROXY myproxy:70"));
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
// Since we have proxy, should try to establish tunnel.
MockWrite data_writes1[] = {
@@ -2671,7 +2670,7 @@
session_deps_.proxy_service.reset(ProxyService::CreateFixed("myproxy:70"));
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -2778,7 +2777,7 @@
session_deps_.proxy_service.reset(ProxyService::CreateFixed("myproxy:70"));
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -2882,7 +2881,7 @@
// Configure against proxy server "myproxy:70".
session_deps_.proxy_service.reset(ProxyService::CreateFixed("myproxy:70"));
- scoped_ptr<HttpNetworkSession> session = CreateSession(&session_deps_);
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -2972,7 +2971,7 @@
// Configure against proxy server "myproxy:70".
session_deps_.proxy_service.reset(ProxyService::CreateFixed("myproxy:70"));
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -3032,7 +3031,7 @@
// Configure against proxy server "myproxy:70".
session_deps_.proxy_service.reset(ProxyService::CreateFixed("myproxy:70"));
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -3093,7 +3092,7 @@
request.load_flags = 0;
// We are using a DIRECT connection (i.e. no proxy) for this session.
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -3141,7 +3140,7 @@
session_deps_.proxy_service.reset(ProxyService::CreateFixed("myproxy:70"));
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
// Since we have proxy, should try to establish tunnel.
MockWrite data_writes1[] = {
@@ -3207,7 +3206,7 @@
ProxyService::CreateFixed("PROXY myproxy:70"));
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
// Since we have proxy, should try to establish tunnel.
MockWrite data_writes1[] = {
@@ -3308,7 +3307,7 @@
ProxyService::CreateFixedFromPacResult("PROXY myproxy:70"));
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
// Since we have proxy, should try to establish tunnel.
MockWrite data_writes1[] = {
@@ -3406,7 +3405,7 @@
"https://proxy:70"));
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
// Since we have proxy, should use full url
MockWrite data_writes1[] = {
@@ -3469,7 +3468,7 @@
"https://proxy:70"));
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
// fetch http://www.example.org/ via SPDY
scoped_ptr<SpdyFrame> req(
@@ -3530,7 +3529,7 @@
ProxyService::CreateFixed("https://proxy:70"));
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
// Fetch http://www.example.org/ through the SPDY proxy.
scoped_ptr<SpdyFrame> req(
@@ -3568,7 +3567,7 @@
SpdySessionKey key(
HostPortPair("proxy", 70), ProxyServer::Direct(), PRIVACY_MODE_DISABLED);
base::WeakPtr<SpdySession> spdy_session =
- CreateSecureSpdySession(session.get(), key, log.bound());
+ CreateSecureSpdySession(session, key, log.bound());
// Unstall the resolution begun by the transaction.
session_deps_.host_resolver->set_ondemand_mode(true);
@@ -3600,7 +3599,7 @@
ProxyService::CreateFixed("https://myproxy:70"));
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<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.
@@ -3701,7 +3700,7 @@
"https://proxy:70"));
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -3786,7 +3785,7 @@
"https://proxy:70"));
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -3878,7 +3877,7 @@
"https://proxy:70"));
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -3930,7 +3929,7 @@
"https://proxy:70"));
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
- scoped_ptr<HttpNetworkSession> session(
+ scoped_refptr<HttpNetworkSession> session(
SpdySessionDependencies::SpdyCreateSession(&session_deps_));
HttpRequestInfo request1;
@@ -4073,7 +4072,7 @@
"https://proxy:70"));
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
- scoped_ptr<HttpNetworkSession> session(
+ scoped_refptr<HttpNetworkSession> session(
SpdySessionDependencies::SpdyCreateSession(&session_deps_));
HttpRequestInfo request1;
@@ -4197,7 +4196,7 @@
"https://proxy:70"));
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
- scoped_ptr<HttpNetworkSession> session(
+ scoped_refptr<HttpNetworkSession> session(
SpdySessionDependencies::SpdyCreateSession(&session_deps_));
HttpRequestInfo request1;
@@ -4304,7 +4303,7 @@
ProxyService::CreateFixed("https://myproxy:70"));
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
// Since we have proxy, should use full url
MockWrite data_writes1[] = {
@@ -4401,7 +4400,7 @@
// Configure against proxy server "myproxy:70".
session_deps_.proxy_service.reset(ProxyService::CreateFixed("myproxy:70"));
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
// Since we have proxy, should try to establish tunnel.
MockWrite data_writes[] = {
@@ -4619,7 +4618,7 @@
// Configure against proxy server "myproxy:70".
session_deps_.proxy_service.reset(ProxyService::CreateFixed("myproxy:70"));
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -4755,7 +4754,7 @@
HttpAuthHandlerNTLM::ScopedProcSetter proc_setter(MockGenerateRandom1,
MockGetHostName);
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
MockWrite data_writes1[] = {
MockWrite("GET /kids/login.aspx HTTP/1.1\r\n"
@@ -4884,7 +4883,7 @@
HttpAuthHandlerNTLM::ScopedProcSetter proc_setter(MockGenerateRandom2,
MockGetHostName);
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
MockWrite data_writes1[] = {
MockWrite("GET /kids/login.aspx HTTP/1.1\r\n"
@@ -5084,7 +5083,7 @@
request.url = GURL("http://www.example.org/");
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -5123,7 +5122,7 @@
// Configure against proxy server "myproxy:70".
session_deps_.proxy_service.reset(ProxyService::CreateFixed("myproxy:70"));
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -5177,7 +5176,7 @@
request.url = GURL("http://www.example.org/");
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -5256,7 +5255,7 @@
TestCompletionCallback callback;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -5326,7 +5325,7 @@
TestCompletionCallback callback;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -5394,7 +5393,7 @@
"rt=prt.2642,ol.2649,xjs.2951");
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -5460,7 +5459,7 @@
request[1].upload_data_stream = &upload_data_stream;
request[1].load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
// The first socket is used for transaction 1 and the first attempt of
// transaction 2.
@@ -5538,7 +5537,7 @@
request.url = GURL("http://foo:b@r@www.example.org/");
request.load_flags = LOAD_NORMAL;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -5621,7 +5620,7 @@
request.load_flags = LOAD_NORMAL;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -5732,7 +5731,7 @@
request.url = GURL("http://foo:bar@www.example.org/");
request.load_flags = LOAD_DO_NOT_USE_EMBEDDED_IDENTITY;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -5806,7 +5805,7 @@
// Test that previously tried username/passwords for a realm get re-used.
TEST_P(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) {
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
// Transaction 1: authenticate (foo, bar) on MyRealm1
{
@@ -6206,7 +6205,7 @@
new HttpAuthHandlerDigest::FixedNonceGenerator("0123456789abcdef");
digest_factory->set_nonce_generator(nonce_generator);
session_deps_.http_auth_handler_factory.reset(digest_factory);
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
// Transaction 1: authenticate (foo, bar) on MyRealm1
{
@@ -6338,7 +6337,7 @@
// Test the ResetStateForRestart() private method.
TEST_P(HttpNetworkTransactionTest, ResetStateForRestart) {
// Create a transaction (the dependencies aren't important).
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpNetworkTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -6385,7 +6384,7 @@
request.url = GURL("https://www.example.org/");
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -6493,7 +6492,7 @@
for (int i = 0; i < 2; i++) {
session_deps_.socket_factory->ResetNextMockIndexes();
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -6559,7 +6558,7 @@
TestCompletionCallback callback;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -6618,7 +6617,7 @@
TestCompletionCallback callback;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -6700,7 +6699,7 @@
TestCompletionCallback callback;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -6753,7 +6752,7 @@
TestCompletionCallback callback;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -6811,7 +6810,7 @@
TestCompletionCallback callback;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -6838,7 +6837,7 @@
ProxyService::CreateFixedFromPacResult("HTTPS myproxy:70"));
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
// Since we have proxy, should try to establish tunnel.
scoped_ptr<SpdyFrame> req(spdy_util_.ConstructSpdyConnect(
@@ -6983,7 +6982,7 @@
// Enable cross-origin push.
session_deps_.trusted_spdy_proxy = "myproxy:70";
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<SpdyFrame> stream1_syn(
spdy_util_.ConstructSpdyGet(NULL, 0, false, 1, LOWEST, false));
@@ -7097,7 +7096,7 @@
// Enable cross-origin push.
session_deps_.trusted_spdy_proxy = "myproxy:70";
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<SpdyFrame> stream1_syn(
spdy_util_.ConstructSpdyGet(NULL, 0, false, 1, LOWEST, false));
@@ -7226,7 +7225,7 @@
TestCompletionCallback callback;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -7255,7 +7254,7 @@
request.extra_headers.SetHeader(HttpRequestHeaders::kUserAgent,
"Chromium Ultra Awesome X Edition");
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -7296,7 +7295,7 @@
"Chromium Ultra Awesome X Edition");
session_deps_.proxy_service.reset(ProxyService::CreateFixed("myproxy:70"));
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -7336,7 +7335,7 @@
request.extra_headers.SetHeader(HttpRequestHeaders::kReferer,
"http://the.previous.site.com/");
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -7374,7 +7373,7 @@
request.method = "POST";
request.url = GURL("http://www.example.org/");
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -7412,7 +7411,7 @@
request.method = "PUT";
request.url = GURL("http://www.example.org/");
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -7450,7 +7449,7 @@
request.method = "HEAD";
request.url = GURL("http://www.example.org/");
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -7487,7 +7486,7 @@
request.url = GURL("http://www.example.org/");
request.load_flags = LOAD_BYPASS_CACHE;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -7528,7 +7527,7 @@
request.url = GURL("http://www.example.org/");
request.load_flags = LOAD_VALIDATE_CACHE;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -7567,7 +7566,7 @@
request.url = GURL("http://www.example.org/");
request.extra_headers.SetHeader("FooHeader", "Bar");
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -7608,7 +7607,7 @@
request.extra_headers.SetHeader("hEllo", "Kitty");
request.extra_headers.SetHeader("FoO", "bar");
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -7654,7 +7653,7 @@
TestNetLog net_log;
session_deps_.net_log = &net_log;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -7713,7 +7712,7 @@
TestNetLog net_log;
session_deps_.net_log = &net_log;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -7777,7 +7776,7 @@
TestNetLog net_log;
session_deps_.net_log = &net_log;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -7836,7 +7835,7 @@
TestNetLog net_log;
session_deps_.net_log = &net_log;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -7908,7 +7907,7 @@
TestNetLog net_log;
session_deps_.net_log = &net_log;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -7985,10 +7984,10 @@
bool ssl;
};
-scoped_ptr<HttpNetworkSession> SetupSessionForGroupNameTests(
+scoped_refptr<HttpNetworkSession> SetupSessionForGroupNameTests(
NextProto next_proto,
SpdySessionDependencies* session_deps_) {
- scoped_ptr<HttpNetworkSession> session(CreateSession(session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(session_deps_));
base::WeakPtr<HttpServerProperties> http_server_properties =
session->http_server_properties();
@@ -8002,15 +8001,16 @@
return session;
}
-int GroupNameTransactionHelper(const std::string& url,
- HttpNetworkSession* session) {
+int GroupNameTransactionHelper(
+ const std::string& url,
+ const scoped_refptr<HttpNetworkSession>& session) {
HttpRequestInfo request;
request.method = "GET";
request.url = GURL(url);
request.load_flags = 0;
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
TestCompletionCallback callback;
@@ -8061,10 +8061,10 @@
for (size_t i = 0; i < arraysize(tests); ++i) {
session_deps_.proxy_service.reset(
ProxyService::CreateFixed(tests[i].proxy_server));
- scoped_ptr<HttpNetworkSession> session(
+ scoped_refptr<HttpNetworkSession> session(
SetupSessionForGroupNameTests(GetParam(), &session_deps_));
- HttpNetworkSessionPeer peer(session.get());
+ HttpNetworkSessionPeer peer(session);
CaptureGroupNameTransportSocketPool* transport_conn_pool =
new CaptureGroupNameTransportSocketPool(NULL, NULL);
CaptureGroupNameSSLSocketPool* ssl_conn_pool =
@@ -8076,7 +8076,7 @@
peer.SetClientSocketPoolManager(mock_pool_manager.Pass());
EXPECT_EQ(ERR_IO_PENDING,
- GroupNameTransactionHelper(tests[i].url, session.get()));
+ GroupNameTransactionHelper(tests[i].url, session));
if (tests[i].ssl)
EXPECT_EQ(tests[i].expected_group_name,
ssl_conn_pool->last_group_name_received());
@@ -8123,10 +8123,10 @@
for (size_t i = 0; i < arraysize(tests); ++i) {
session_deps_.proxy_service.reset(
ProxyService::CreateFixed(tests[i].proxy_server));
- scoped_ptr<HttpNetworkSession> session(
+ scoped_refptr<HttpNetworkSession> session(
SetupSessionForGroupNameTests(GetParam(), &session_deps_));
- HttpNetworkSessionPeer peer(session.get());
+ HttpNetworkSessionPeer peer(session);
HostPortPair proxy_host("http_proxy", 80);
CaptureGroupNameHttpProxySocketPool* http_proxy_pool =
@@ -8141,7 +8141,7 @@
peer.SetClientSocketPoolManager(mock_pool_manager.Pass());
EXPECT_EQ(ERR_IO_PENDING,
- GroupNameTransactionHelper(tests[i].url, session.get()));
+ GroupNameTransactionHelper(tests[i].url, session));
if (tests[i].ssl)
EXPECT_EQ(tests[i].expected_group_name,
ssl_conn_pool->last_group_name_received());
@@ -8193,10 +8193,10 @@
for (size_t i = 0; i < arraysize(tests); ++i) {
session_deps_.proxy_service.reset(
ProxyService::CreateFixed(tests[i].proxy_server));
- scoped_ptr<HttpNetworkSession> session(
+ scoped_refptr<HttpNetworkSession> session(
SetupSessionForGroupNameTests(GetParam(), &session_deps_));
- HttpNetworkSessionPeer peer(session.get());
+ HttpNetworkSessionPeer peer(session);
HostPortPair proxy_host("socks_proxy", 1080);
CaptureGroupNameSOCKSSocketPool* socks_conn_pool =
@@ -8214,7 +8214,7 @@
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
EXPECT_EQ(ERR_IO_PENDING,
- GroupNameTransactionHelper(tests[i].url, session.get()));
+ GroupNameTransactionHelper(tests[i].url, session));
if (tests[i].ssl)
EXPECT_EQ(tests[i].expected_group_name,
ssl_conn_pool->last_group_name_received());
@@ -8236,7 +8236,7 @@
// connecting to both proxies (myproxy:70 and foobar:80).
session_deps_.host_resolver->rules()->AddSimulatedFailure("*");
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -8262,7 +8262,7 @@
// Select a host resolver that does caching.
session_deps_.host_resolver.reset(new MockCachingHostResolver);
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -8331,7 +8331,7 @@
StaticSocketDataProvider data(NULL, 0,
write_failure, arraysize(write_failure));
session_deps_.socket_factory->AddSocketDataProvider(&data);
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
TestCompletionCallback callback;
@@ -8359,7 +8359,7 @@
StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0);
session_deps_.socket_factory->AddSocketDataProvider(&data);
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
TestCompletionCallback callback;
@@ -8433,7 +8433,7 @@
StaticSocketDataProvider data2(data_reads2, arraysize(data_reads2),
data_writes2, arraysize(data_writes2));
session_deps_.socket_factory->AddSocketDataProvider(&data2);
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
TestCompletionCallback callback1;
@@ -8489,7 +8489,7 @@
session_deps_.socket_factory->ResetNextMockIndexes();
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -8506,7 +8506,7 @@
request.url = GURL("http://www.example.org/");
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -8555,7 +8555,7 @@
request.upload_data_stream = &upload_data_stream;
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -8610,7 +8610,7 @@
request.load_flags = 0;
// If we try to upload an unreadable file, the transaction should fail.
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -8664,7 +8664,7 @@
request.upload_data_stream = &upload_data_stream;
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -8771,7 +8771,7 @@
TestCompletionCallback callback1;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -8866,7 +8866,7 @@
TestCompletionCallback callback;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -8930,7 +8930,7 @@
TestCompletionCallback callback;
- scoped_ptr<HttpNetworkSession> session = CreateSession(&session_deps_);
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -8987,7 +8987,7 @@
TestCompletionCallback callback;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -9054,7 +9054,7 @@
TestCompletionCallback callback;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -9111,7 +9111,7 @@
TestCompletionCallback callback;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
HostPortPair http_host_port_pair("www.example.org", 80);
HttpServerProperties& http_server_properties =
@@ -9178,7 +9178,7 @@
TestCompletionCallback callback;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -9237,7 +9237,7 @@
nullptr, 0);
session_deps_.socket_factory->AddSocketDataProvider(&second_data);
- scoped_ptr<HttpNetworkSession> session = CreateSession(&session_deps_);
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
base::WeakPtr<HttpServerProperties> http_server_properties =
session->http_server_properties();
@@ -9281,7 +9281,7 @@
data_reads, arraysize(data_reads), NULL, 0);
session_deps_.socket_factory->AddSocketDataProvider(&second_data);
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
base::WeakPtr<HttpServerProperties> http_server_properties =
session->http_server_properties();
@@ -9347,7 +9347,7 @@
data_reads, arraysize(data_reads), NULL, 0);
session_deps_.socket_factory->AddSocketDataProvider(&second_data);
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
base::WeakPtr<HttpServerProperties> http_server_properties =
session->http_server_properties();
@@ -9399,7 +9399,7 @@
data_reads, arraysize(data_reads), NULL, 0);
session_deps_.socket_factory->AddSocketDataProvider(&second_data);
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
base::WeakPtr<HttpServerProperties> http_server_properties =
session->http_server_properties();
@@ -9450,7 +9450,7 @@
data_reads, arraysize(data_reads), NULL, 0);
session_deps_.socket_factory->AddSocketDataProvider(&second_data);
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
base::WeakPtr<HttpServerProperties> http_server_properties =
session->http_server_properties();
@@ -9502,7 +9502,7 @@
data_reads, arraysize(data_reads), NULL, 0);
session_deps_.socket_factory->AddSocketDataProvider(&second_data);
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
base::WeakPtr<HttpServerProperties> http_server_properties =
session->http_server_properties();
@@ -9553,7 +9553,7 @@
data_reads, arraysize(data_reads), NULL, 0);
session_deps_.socket_factory->AddSocketDataProvider(&second_data);
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
base::WeakPtr<HttpServerProperties> http_server_properties =
session->http_server_properties();
@@ -9599,7 +9599,7 @@
data_reads, arraysize(data_reads), NULL, 0);
session_deps_.socket_factory->AddSocketDataProvider(&data);
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
base::WeakPtr<HttpServerProperties> http_server_properties =
session->http_server_properties();
@@ -9684,7 +9684,7 @@
TestCompletionCallback callback;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -9786,7 +9786,7 @@
// Socket 5 is the unsuccessful non-Alternate-Protocol for transaction 3.
session_deps_.socket_factory->AddSocketDataProvider(&hanging_socket);
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
TestCompletionCallback callback1;
HttpNetworkTransaction trans1(DEFAULT_PRIORITY, session.get());
@@ -9877,7 +9877,7 @@
TestCompletionCallback callback;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -10041,7 +10041,7 @@
TestCompletionCallback callback;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -10134,7 +10134,7 @@
TestCompletionCallback callback;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -10157,7 +10157,7 @@
SpdySessionKey key(host_port_pair, ProxyServer::Direct(),
PRIVACY_MODE_DISABLED);
base::WeakPtr<SpdySession> spdy_session =
- CreateSecureSpdySession(session.get(), key, BoundNetLog());
+ CreateSecureSpdySession(session, key, BoundNetLog());
trans.reset(new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -10526,7 +10526,7 @@
request.url = GURL(test_config.server_url);
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
HttpNetworkTransaction trans(DEFAULT_PRIORITY, session.get());
SSLSocketDataProvider ssl_socket_data_provider(SYNCHRONOUS, OK);
@@ -10625,12 +10625,12 @@
request.url = origin;
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<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.get());
+ HttpNetworkSessionPeer session_peer(session);
TransportClientSocketPool* transport_pool = new TransportClientSocketPool(
50, // Max sockets for pool
1, // Max sockets per group
@@ -10825,7 +10825,7 @@
TestCompletionCallback callback;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -10877,7 +10877,7 @@
TestCompletionCallback callback;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -11031,7 +11031,7 @@
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl);
session_deps_.socket_factory->AddSocketDataProvider(
&hanging_non_alternate_protocol_socket);
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
// First round should work and provide the Alternate-Protocol state.
TestCompletionCallback callback_1;
@@ -11091,7 +11091,7 @@
request.load_flags = 0;
session_deps_.host_resolver->set_synchronous_mode(true);
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -11129,7 +11129,7 @@
StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0);
session_deps_.socket_factory->AddSocketDataProvider(&data);
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
{
HttpRequestInfo request;
@@ -11165,7 +11165,7 @@
ProxyService::CreateFixedFromPacResult("PROXY myproxy:70"));
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
HttpRequestInfo request;
request.method = "GET";
@@ -11229,7 +11229,7 @@
ProxyService::CreateFixedFromPacResult("PROXY myproxy:70"));
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
HttpRequestInfo request;
request.method = "GET";
@@ -11306,7 +11306,7 @@
session_deps_.proxy_service.reset(ProxyService::CreateFixed("myproxy:70"));
BoundTestNetLog log;
session_deps_.net_log = log.bound().net_log();
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
HttpRequestInfo request;
request.method = "GET";
@@ -11378,14 +11378,14 @@
ssl.SetNextProto(GetParam());
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl);
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
// Set up an initial SpdySession in the pool to reuse.
HostPortPair host_port_pair("www.example.org", 443);
SpdySessionKey key(host_port_pair, ProxyServer::Direct(),
PRIVACY_MODE_DISABLED);
base::WeakPtr<SpdySession> spdy_session =
- CreateInsecureSpdySession(session.get(), key, BoundNetLog());
+ CreateInsecureSpdySession(session, key, BoundNetLog());
HttpRequestInfo request;
request.method = "GET";
@@ -11421,7 +11421,7 @@
session_deps_.socket_factory->AddSocketDataProvider(&data);
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl_data);
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -11508,7 +11508,7 @@
StaticSocketDataProvider data4(NULL, 0, NULL, 0);
session_deps_.socket_factory->AddSocketDataProvider(&data4);
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -11625,7 +11625,7 @@
StaticSocketDataProvider data5(data2_reads, arraysize(data2_reads), NULL, 0);
session_deps_.socket_factory->AddSocketDataProvider(&data5);
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -11718,7 +11718,7 @@
for (size_t i = 0; i < arraysize(requests); ++i) {
session_deps_.socket_factory->ResetNextMockIndexes();
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpNetworkTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -11771,7 +11771,7 @@
// Set up a special HttpNetworkSession with a MockCachingHostResolver.
session_deps_.host_resolver.reset(new MockCachingHostResolver());
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
SpdySessionPoolPeer pool_peer(session->spdy_session_pool());
pool_peer.DisableDomainAuthenticationVerification();
@@ -11870,7 +11870,7 @@
// Set up a special HttpNetworkSession with a MockCachingHostResolver.
session_deps_.host_resolver.reset(new MockCachingHostResolver());
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
SpdySessionPoolPeer pool_peer(session->spdy_session_pool());
pool_peer.DisableDomainAuthenticationVerification();
@@ -12000,7 +12000,7 @@
HttpNetworkSession::Params params =
SpdySessionDependencies::CreateSessionParams(&session_deps_);
params.host_resolver = &host_resolver;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
SpdySessionPoolPeer pool_peer(session->spdy_session_pool());
pool_peer.DisableDomainAuthenticationVerification();
@@ -12140,7 +12140,7 @@
session_deps_.socket_factory->AddSocketDataProvider(&data1);
session_deps_.socket_factory->AddSocketDataProvider(&data2);
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
// Start the first transaction to set up the SpdySession
HttpRequestInfo request1;
@@ -12252,7 +12252,7 @@
session_deps_.socket_factory->AddSocketDataProvider(&data_refused);
session_deps_.use_alternative_services = true;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
base::WeakPtr<HttpServerProperties> http_server_properties =
session->http_server_properties();
AlternativeService alternative_service(
@@ -12356,7 +12356,7 @@
// Set up alternative service for origin.
session_deps_.use_alternative_services = true;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
base::WeakPtr<HttpServerProperties> http_server_properties =
session->http_server_properties();
AlternativeService alternative_service(
@@ -12429,7 +12429,7 @@
// Set up alternative service for origin.
session_deps_.use_alternative_services = true;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
base::WeakPtr<HttpServerProperties> http_server_properties =
session->http_server_properties();
AlternativeService alternative_service(
@@ -12538,7 +12538,7 @@
// Set up alternative service for origin.
session_deps_.use_alternative_services = true;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
base::WeakPtr<HttpServerProperties> http_server_properties =
session->http_server_properties();
AlternativeService alternative_service(
@@ -12672,7 +12672,7 @@
session_deps_.deterministic_socket_factory->AddSSLSocketDataProvider(&ssl2);
session_deps_.deterministic_socket_factory->AddSocketDataProvider(&data1);
- scoped_ptr<HttpNetworkSession> session(
+ scoped_refptr<HttpNetworkSession> session(
SpdySessionDependencies::SpdyCreateSessionDeterministic(&session_deps_));
// Start the first transaction to set up the SpdySession
@@ -12806,7 +12806,7 @@
session_deps_.host_resolver->rules()->AddRule("news.example.org", ip_addr);
session_deps_.host_resolver->rules()->AddRule("proxy", ip_addr);
- scoped_ptr<HttpNetworkSession> session(
+ scoped_refptr<HttpNetworkSession> session(
SpdySessionDependencies::SpdyCreateSessionDeterministic(&session_deps_));
// Start the first transaction to set up the SpdySession
@@ -12881,7 +12881,7 @@
session_deps_.socket_factory->AddSSLSocketDataProvider(&ssl2);
session_deps_.socket_factory->AddSocketDataProvider(&data2);
- scoped_ptr<HttpNetworkSession> session(
+ scoped_refptr<HttpNetworkSession> session(
SpdySessionDependencies::SpdyCreateSession(&session_deps_));
// Start the first transaction to set up the SpdySession and verify that
@@ -12920,7 +12920,7 @@
// 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_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
SSLSocketDataProvider ssl1(ASYNC, OK);
ssl1.SetNextProto(GetParam());
@@ -13080,7 +13080,7 @@
request.url = GURL("http://www.example.org/");
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -13113,7 +13113,7 @@
request.url = GURL("http://www.example.org/");
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -13146,7 +13146,7 @@
request.url = GURL("http://www.example.org/");
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -13180,7 +13180,7 @@
request.url = GURL("http://www.example.org/");
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -13214,7 +13214,7 @@
request.url = GURL("http://www.example.org/");
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -13251,7 +13251,7 @@
request.url = GURL("http://www.example.org/");
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -13289,7 +13289,7 @@
request.load_flags = 0;
request.extra_headers.SetHeader("X-Foo", "bar");
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -13675,8 +13675,8 @@
// Make sure that HttpNetworkTransaction passes on its priority to its
// stream request on start.
TEST_P(HttpNetworkTransactionTest, SetStreamRequestPriorityOnStart) {
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
- HttpNetworkSessionPeer peer(session.get());
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ HttpNetworkSessionPeer peer(session);
FakeStreamFactory* fake_factory = new FakeStreamFactory();
peer.SetHttpStreamFactory(scoped_ptr<HttpStreamFactory>(fake_factory));
@@ -13698,8 +13698,8 @@
// Make sure that HttpNetworkTransaction passes on its priority
// updates to its stream request.
TEST_P(HttpNetworkTransactionTest, SetStreamRequestPriority) {
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
- HttpNetworkSessionPeer peer(session.get());
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ HttpNetworkSessionPeer peer(session);
FakeStreamFactory* fake_factory = new FakeStreamFactory();
peer.SetHttpStreamFactory(scoped_ptr<HttpStreamFactory>(fake_factory));
@@ -13723,8 +13723,8 @@
// Make sure that HttpNetworkTransaction passes on its priority
// updates to its stream.
TEST_P(HttpNetworkTransactionTest, SetStreamPriority) {
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
- HttpNetworkSessionPeer peer(session.get());
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ HttpNetworkSessionPeer peer(session);
FakeStreamFactory* fake_factory = new FakeStreamFactory();
peer.SetHttpStreamFactory(scoped_ptr<HttpStreamFactory>(fake_factory));
@@ -13753,8 +13753,8 @@
std::string test_cases[] = {"ws://www.example.org/",
"wss://www.example.org/"};
for (size_t i = 0; i < arraysize(test_cases); ++i) {
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
- HttpNetworkSessionPeer peer(session.get());
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ HttpNetworkSessionPeer peer(session);
FakeStreamFactory* fake_factory = new FakeStreamFactory();
FakeWebSocketStreamCreateHelper websocket_stream_create_helper;
peer.SetHttpStreamFactoryForWebSocket(
@@ -13835,7 +13835,7 @@
http_writes, arraysize(http_writes));
session_deps_.socket_factory->AddSocketDataProvider(&http_data);
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
// Start the SSL request.
TestCompletionCallback ssl_callback;
@@ -13917,7 +13917,7 @@
http_writes, arraysize(http_writes));
session_deps_.socket_factory->AddSocketDataProvider(&http_data);
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
// Preconnect an SSL socket. A preconnect is needed because connect jobs are
// cancelled when a normal transaction is cancelled.
@@ -13958,7 +13958,7 @@
request.upload_data_stream = &upload_data_stream;
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<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.
@@ -14003,7 +14003,7 @@
// response from a server that rejected a POST with a CONNECTION_RESET.
TEST_P(HttpNetworkTransactionTest,
PostReadsErrorResponseAfterResetOnReusedSocket) {
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
MockWrite data_writes[] = {
MockWrite("GET / HTTP/1.1\r\n"
"Host: www.foo.com\r\n"
@@ -14097,7 +14097,7 @@
request.upload_data_stream = &upload_data_stream;
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<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.
@@ -14152,7 +14152,7 @@
request.upload_data_stream = &upload_data_stream;
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<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.
@@ -14211,7 +14211,7 @@
request.upload_data_stream = &upload_data_stream;
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -14264,7 +14264,7 @@
request.upload_data_stream = &upload_data_stream;
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<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.
@@ -14306,7 +14306,7 @@
request.upload_data_stream = &upload_data_stream;
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<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.
@@ -14349,7 +14349,7 @@
request.upload_data_stream = &upload_data_stream;
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<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.
@@ -14389,7 +14389,7 @@
request.upload_data_stream = &upload_data_stream;
request.load_flags = 0;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<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.
@@ -14430,7 +14430,7 @@
session_deps_.proxy_service.reset(
ProxyService::CreateFixedFromPacResult("PROXY myproxy:70"));
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
// Since a proxy is configured, try to establish a tunnel.
MockWrite data_writes[] = {
@@ -14537,7 +14537,7 @@
session_deps_.proxy_service.reset(
ProxyService::CreateFixedFromPacResult("PROXY myproxy:70"));
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
MockWrite data_writes[] = {
// Try to establish a tunnel for the WebSocket connection, with
@@ -14613,7 +14613,7 @@
request.url = GURL("http://www.foo.com/");
request.upload_data_stream = &upload_data_stream;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
MockWrite data_writes[] = {
@@ -14657,7 +14657,7 @@
request.url = GURL("http://www.foo.com/");
request.upload_data_stream = &upload_data_stream;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
MockWrite data_writes[] = {
@@ -14702,7 +14702,7 @@
request.url = GURL("http://www.foo.com/");
request.upload_data_stream = &upload_data_stream;
- scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_refptr<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.
« no previous file with comments | « net/http/http_network_transaction_ssl_unittest.cc ('k') | net/http/http_proxy_client_socket_pool_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698