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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_network_transaction_unittest.cc

Issue 24246016: Make HttpNetworkTransaction no longer own a reference to HttpNetworkSession. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Sync, fix new test Created 7 years, 2 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.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_network_transaction_unittest.cc
===================================================================
--- net/http/http_network_transaction_unittest.cc (revision 228979)
+++ net/http/http_network_transaction_unittest.cc (working copy)
@@ -289,9 +289,9 @@
CapturingBoundNetLog log;
session_deps_.net_log = log.bound().net_log();
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
for (size_t i = 0; i < data_count; ++i) {
session_deps_.socket_factory->AddSocketDataProvider(data[i]);
@@ -566,9 +566,9 @@
} // namespace
TEST_P(HttpNetworkTransactionTest, Basic) {
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
}
TEST_P(HttpNetworkTransactionTest, SimpleGET) {
@@ -861,9 +861,9 @@
request.url = GURL("http://redirect.com/");
request.load_flags = 0;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0);
session_deps_.socket_factory->AddSocketDataProvider(&data);
@@ -905,9 +905,9 @@
request.url = GURL("http://www.google.com/");
request.load_flags = 0;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockWrite data_writes1[] = {
MockWrite("HEAD / HTTP/1.1\r\n"
@@ -1017,9 +1017,9 @@
request.upload_data_stream = &upload_data_stream;
request.load_flags = 0;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockRead data_reads[] = {
MockRead("HTTP/1.0 100 Continue\r\n\r\n"),
@@ -1059,9 +1059,9 @@
request.url = GURL("http://www.foo.com/");
request.load_flags = 0;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockRead data_reads[] = {
MockRead("HTTP/1.1 102 Unspecified status code\r\n\r\n"
@@ -1098,9 +1098,9 @@
request.url = GURL("http://www.foo.com/");
request.load_flags = 0;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockRead data_reads[] = {
MockRead(SYNCHRONOUS, "HTTP/1.0 100 Continue\r\n"),
@@ -1129,10 +1129,11 @@
request.url = GURL("http://www.foo.com/");
request.load_flags = 0;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
+
MockRead data_reads[] = {
MockRead(ASYNC, 0),
};
@@ -1259,9 +1260,9 @@
request.url = GURL("http://www.google.com/");
request.load_flags = 0;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockRead data_reads[] = {
MockRead(ASYNC, ERR_CONNECTION_RESET),
@@ -1507,9 +1508,9 @@
CapturingNetLog log;
session_deps_.net_log = &log;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockWrite data_writes1[] = {
MockWrite("GET / HTTP/1.1\r\n"
@@ -1600,9 +1601,9 @@
request.url = GURL("http://www.google.com/");
request.load_flags = net::LOAD_DO_NOT_SEND_AUTH_DATA;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockWrite data_writes[] = {
MockWrite("GET / HTTP/1.1\r\n"
@@ -2263,9 +2264,9 @@
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<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockWrite data_writes1[] = {
MockWrite("GET / HTTP/1.1\r\n"
@@ -3529,7 +3530,6 @@
// Configure against proxy server "myproxy:70".
session_deps_.proxy_service.reset(ProxyService::CreateFixed("myproxy:70"));
-
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
// Since we have proxy, should try to establish tunnel.
@@ -3741,11 +3741,12 @@
request.url = GURL("http://www.google.com/");
request.load_flags = 0;
+ // Configure against proxy server "myproxy:70".
session_deps_.proxy_service.reset(ProxyService::CreateFixed("myproxy:70"));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
- // Configure against proxy server "myproxy:70".
- scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ scoped_ptr<HttpTransaction> trans(
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockWrite data_writes1[] = {
MockWrite("GET http://www.google.com/ HTTP/1.1\r\n"
@@ -4204,9 +4205,9 @@
request.url = GURL("http://www.google.com/");
request.load_flags = 0;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
// Respond with 300 kb of headers (we should fail after 256 kb).
std::string large_headers_string;
@@ -4659,9 +4660,9 @@
request.url = GURL("http://foo:b@r@www.google.com/");
request.load_flags = LOAD_NORMAL;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
// The password contains an escaped character -- for this test to pass it
// will need to be unescaped by HttpNetworkTransaction.
@@ -4740,9 +4741,9 @@
request.load_flags = LOAD_NORMAL;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockWrite data_writes1[] = {
MockWrite("GET / HTTP/1.1\r\n"
@@ -4848,9 +4849,9 @@
request.url = GURL("http://foo:bar@www.google.com/");
request.load_flags = LOAD_DO_NOT_USE_EMBEDDED_IDENTITY;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockWrite data_writes1[] = {
MockWrite("GET / HTTP/1.1\r\n"
@@ -5439,9 +5440,9 @@
// 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<HttpNetworkTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
// Setup some state (which we expect ResetStateForRestart() will clear).
trans->read_buf_ = new IOBuffer(15);
@@ -5486,9 +5487,9 @@
request.url = GURL("https://www.google.com/");
request.load_flags = 0;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockWrite data_writes[] = {
MockWrite("GET / HTTP/1.1\r\n"
@@ -5590,9 +5591,9 @@
for (int i = 0; i < 2; i++) {
session_deps_.socket_factory->ResetNextMockIndexes();
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
int rv = trans->Start(&request, callback.callback(), BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -5654,9 +5655,9 @@
TestCompletionCallback callback;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
int rv = trans->Start(&request, callback.callback(), BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -5712,9 +5713,9 @@
TestCompletionCallback callback;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
int rv = trans->Start(&request, callback.callback(), BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -5797,9 +5798,9 @@
TestCompletionCallback callback;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
int rv = trans->Start(&request, callback.callback(), BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -5849,9 +5850,9 @@
TestCompletionCallback callback;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
int rv = trans->Start(&request, callback.callback(), BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -5910,9 +5911,9 @@
TestCompletionCallback callback;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
int rv = trans->Start(&request, callback.callback(), BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -6335,9 +6336,9 @@
TestCompletionCallback callback;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
int rv = trans->Start(&request, callback.callback(), BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -6364,9 +6365,9 @@
request.extra_headers.SetHeader(HttpRequestHeaders::kUserAgent,
"Chromium Ultra Awesome X Edition");
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockWrite data_writes[] = {
MockWrite("GET / HTTP/1.1\r\n"
@@ -6404,9 +6405,9 @@
"Chromium Ultra Awesome X Edition");
session_deps_.proxy_service.reset(ProxyService::CreateFixed("myproxy:70"));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockWrite data_writes[] = {
MockWrite("CONNECT www.google.com:443 HTTP/1.1\r\n"
@@ -6443,9 +6444,9 @@
request.extra_headers.SetHeader(HttpRequestHeaders::kReferer,
"http://the.previous.site.com/");
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockWrite data_writes[] = {
MockWrite("GET / HTTP/1.1\r\n"
@@ -6480,9 +6481,9 @@
request.method = "POST";
request.url = GURL("http://www.google.com/");
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockWrite data_writes[] = {
MockWrite("POST / HTTP/1.1\r\n"
@@ -6517,9 +6518,9 @@
request.method = "PUT";
request.url = GURL("http://www.google.com/");
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockWrite data_writes[] = {
MockWrite("PUT / HTTP/1.1\r\n"
@@ -6554,9 +6555,9 @@
request.method = "HEAD";
request.url = GURL("http://www.google.com/");
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockWrite data_writes[] = {
MockWrite("HEAD / HTTP/1.1\r\n"
@@ -6592,9 +6593,9 @@
request.url = GURL("http://www.google.com/");
request.load_flags = LOAD_BYPASS_CACHE;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockWrite data_writes[] = {
MockWrite("GET / HTTP/1.1\r\n"
@@ -6632,9 +6633,9 @@
request.url = GURL("http://www.google.com/");
request.load_flags = LOAD_VALIDATE_CACHE;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockWrite data_writes[] = {
MockWrite("GET / HTTP/1.1\r\n"
@@ -6670,9 +6671,9 @@
request.url = GURL("http://www.google.com/");
request.extra_headers.SetHeader("FooHeader", "Bar");
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockWrite data_writes[] = {
MockWrite("GET / HTTP/1.1\r\n"
@@ -6710,9 +6711,9 @@
request.extra_headers.SetHeader("hEllo", "Kitty");
request.extra_headers.SetHeader("FoO", "bar");
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockWrite data_writes[] = {
MockWrite("GET / HTTP/1.1\r\n"
@@ -6755,9 +6756,9 @@
CapturingNetLog net_log;
session_deps_.net_log = &net_log;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
char write_buffer[] = { 0x04, 0x01, 0x00, 0x50, 127, 0, 0, 1, 0 };
char read_buffer[] = { 0x00, 0x5A, 0x00, 0x00, 0, 0, 0, 0 };
@@ -6814,9 +6815,9 @@
CapturingNetLog net_log;
session_deps_.net_log = &net_log;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
unsigned char write_buffer[] = { 0x04, 0x01, 0x01, 0xBB, 127, 0, 0, 1, 0 };
unsigned char read_buffer[] = { 0x00, 0x5A, 0x00, 0x00, 0, 0, 0, 0 };
@@ -6878,9 +6879,9 @@
CapturingNetLog net_log;
session_deps_.net_log = &net_log;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
char write_buffer[] = { 0x04, 0x01, 0x00, 0x50, 127, 0, 0, 1, 0 };
char read_buffer[] = { 0x00, 0x5A, 0x00, 0x00, 0, 0, 0, 0 };
@@ -6937,9 +6938,9 @@
CapturingNetLog net_log;
session_deps_.net_log = &net_log;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
const char kSOCKS5GreetRequest[] = { 0x05, 0x01, 0x00 };
const char kSOCKS5GreetResponse[] = { 0x05, 0x00 };
@@ -7010,9 +7011,9 @@
CapturingNetLog net_log;
session_deps_.net_log = &net_log;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
const char kSOCKS5GreetRequest[] = { 0x05, 0x01, 0x00 };
const char kSOCKS5GreetResponse[] = { 0x05, 0x00 };
@@ -7338,9 +7339,9 @@
// connecting to both proxies (myproxy:70 and foobar:80).
session_deps_.host_resolver->rules()->AddSimulatedFailure("*");
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
TestCompletionCallback callback;
@@ -7364,8 +7365,9 @@
// Select a host resolver that does caching.
session_deps_.host_resolver.reset(new MockCachingHostResolver);
- scoped_ptr<HttpTransaction> trans(new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
+ scoped_ptr<HttpTransaction> trans(
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
// Warm up the host cache so it has an entry for "www.google.com".
AddressList addrlist;
@@ -7429,8 +7431,6 @@
// Make sure we can handle an error when writing the request.
TEST_P(HttpNetworkTransactionTest, RequestWriteError) {
- scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
-
HttpRequestInfo request;
request.method = "GET";
request.url = GURL("http://www.foo.com/");
@@ -7442,12 +7442,12 @@
StaticSocketDataProvider data(NULL, 0,
write_failure, arraysize(write_failure));
session_deps_.socket_factory->AddSocketDataProvider(&data);
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
TestCompletionCallback callback;
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
int rv = trans->Start(&request, callback.callback(), BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -7458,8 +7458,6 @@
// Check that a connection closed after the start of the headers finishes ok.
TEST_P(HttpNetworkTransactionTest, ConnectionClosedAfterStartOfHeaders) {
- scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
-
HttpRequestInfo request;
request.method = "GET";
request.url = GURL("http://www.foo.com/");
@@ -7472,12 +7470,12 @@
StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0);
session_deps_.socket_factory->AddSocketDataProvider(&data);
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
TestCompletionCallback callback;
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
int rv = trans->Start(&request, callback.callback(), BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -7500,8 +7498,6 @@
// Make sure that a dropped connection while draining the body for auth
// restart does the right thing.
TEST_P(HttpNetworkTransactionTest, DrainResetOK) {
- scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
-
HttpRequestInfo request;
request.method = "GET";
request.url = GURL("http://www.google.com/");
@@ -7546,6 +7542,7 @@
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_));
TestCompletionCallback callback1;
@@ -7601,9 +7598,9 @@
session_deps_.socket_factory->ResetNextMockIndexes();
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
int rv = trans->Start(&request, callback.callback(), BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -7618,9 +7615,9 @@
request.url = GURL("http://www.google.com/");
request.load_flags = 0;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockRead data_reads[] = {
MockRead("HTTP/1.0 200 OK\r\nContent-Length:6719476739\r\n\r\n"),
@@ -7670,9 +7667,9 @@
request.upload_data_stream = &upload_data_stream;
request.load_flags = 0;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockRead data_reads[] = {
MockRead("HTTP/1.0 200 OK\r\n\r\n"),
@@ -7729,9 +7726,9 @@
// If we try to upload an unreadable file, the network stack should report
// the file size as zero and upload zero bytes for that file.
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockRead data_reads[] = {
MockRead("HTTP/1.0 200 OK\r\n\r\n"),
@@ -7787,9 +7784,9 @@
request.upload_data_stream = &upload_data_stream;
request.load_flags = 0;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockRead data_reads[] = {
MockRead("HTTP/1.1 401 Unauthorized\r\n"),
@@ -7891,9 +7888,9 @@
request.upload_data_stream = &upload_data_stream;
request.load_flags = 0;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
StaticSocketDataProvider data;
session_deps_.socket_factory->AddSocketDataProvider(&data);
@@ -7995,9 +7992,9 @@
TestCompletionCallback callback1;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
// Issue the first request with Authorize headers. There should be a
// password prompt for first_realm waiting to be filled in after the
@@ -9370,8 +9367,7 @@
request.load_flags = 0;
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
- HttpNetworkTransaction trans(
- DEFAULT_PRIORITY, CreateSession(&session_deps_));
+ HttpNetworkTransaction trans(DEFAULT_PRIORITY, session);
for (int round = 0; round < test_config.num_auth_rounds; ++round) {
const TestRound& read_write_round = test_config.rounds[round];
@@ -9926,9 +9922,9 @@
request.load_flags = 0;
session_deps_.host_resolver->set_synchronous_mode(true);
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0);
data.set_connect_data(mock_connect);
@@ -11608,9 +11604,9 @@
request.url = GURL("http://www.google.com/");
request.load_flags = 0;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockConnect mock_connect(SYNCHRONOUS, ERR_CONNECTION_REFUSED);
StaticSocketDataProvider data;
@@ -11638,9 +11634,9 @@
request.url = GURL("http://www.google.com/");
request.load_flags = 0;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockConnect mock_connect(ASYNC, ERR_CONNECTION_REFUSED);
StaticSocketDataProvider data;
@@ -11668,9 +11664,9 @@
request.url = GURL("http://www.google.com/");
request.load_flags = 0;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockWrite data_writes[] = {
MockWrite(SYNCHRONOUS, ERR_CONNECTION_RESET),
@@ -11704,9 +11700,9 @@
request.url = GURL("http://www.google.com/");
request.load_flags = 0;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockWrite data_writes[] = {
MockWrite(ASYNC, ERR_CONNECTION_RESET),
@@ -11740,9 +11736,9 @@
request.url = GURL("http://www.google.com/");
request.load_flags = 0;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockWrite data_writes[] = {
MockWrite("GET / HTTP/1.1\r\n"
@@ -11778,9 +11774,9 @@
request.url = GURL("http://www.google.com/");
request.load_flags = 0;
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockWrite data_writes[] = {
MockWrite("GET / HTTP/1.1\r\n"
@@ -11817,9 +11813,9 @@
request.load_flags = 0;
request.extra_headers.SetHeader("X-Foo", "bar");
+ scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
scoped_ptr<HttpTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY,
- CreateSession(&session_deps_)));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
MockWrite data_writes[] = {
MockWrite("GET / HTTP/1.1\r\n"
« no previous file with comments | « net/http/http_network_transaction.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698