Index: net/url_request/url_request_unittest.cc |
=================================================================== |
--- net/url_request/url_request_unittest.cc (revision 104227) |
+++ net/url_request/url_request_unittest.cc (working copy) |
@@ -253,6 +253,7 @@ |
public: |
URLRequestTest() : default_context_(new TestURLRequestContext(true)) { |
default_context_->set_network_delegate(&default_network_delegate_); |
+ default_context_->set_http_server_properties(NULL); |
default_context_->Init(); |
} |
@@ -363,6 +364,7 @@ |
scoped_refptr<TestURLRequestContext> context(new TestURLRequestContext(true)); |
context->SetProxyFromString(test_server_.host_port_pair().ToString()); |
context->set_network_delegate(&network_delegate); |
+ context->set_http_server_properties(NULL); |
context->Init(); |
TestDelegate d; |
@@ -391,6 +393,7 @@ |
scoped_refptr<TestURLRequestContext> context(new TestURLRequestContext(true)); |
context->SetProxyFromString(test_server_.host_port_pair().ToString()); |
context->set_network_delegate(&network_delegate); |
+ context->set_http_server_properties(NULL); |
context->Init(); |
TestDelegate d; |
@@ -424,6 +427,7 @@ |
scoped_refptr<TestURLRequestContext> context(new TestURLRequestContext(true)); |
context->SetProxyFromString(test_server_.host_port_pair().ToString()); |
context->set_network_delegate(&network_delegate); |
+ context->set_http_server_properties(NULL); |
context->Init(); |
{ |
@@ -452,6 +456,7 @@ |
scoped_refptr<TestURLRequestContext> context(new TestURLRequestContext(true)); |
context->SetProxyFromString(test_server_.host_port_pair().ToString()); |
context->set_network_delegate(&network_delegate); |
+ context->set_http_server_properties(NULL); |
context->Init(); |
{ |
@@ -482,6 +487,7 @@ |
scoped_refptr<TestURLRequestContext> context(new TestURLRequestContext(true)); |
context->SetProxyFromString(test_server_.host_port_pair().ToString()); |
context->set_network_delegate(&network_delegate); |
+ context->set_http_server_properties(NULL); |
context->Init(); |
{ |
@@ -516,6 +522,7 @@ |
scoped_refptr<TestURLRequestContext> context(new TestURLRequestContext(true)); |
context->set_network_delegate(&network_delegate); |
+ context->set_http_server_properties(NULL); |
context->Init(); |
{ |
@@ -767,6 +774,7 @@ |
scoped_refptr<TestURLRequestContext> context(new TestURLRequestContext(true)); |
context->SetProxyFromString(test_server_.host_port_pair().ToString()); |
context->set_network_delegate(&network_delegate); |
+ context->set_http_server_properties(NULL); |
context->Init(); |
TestDelegate d; |
@@ -860,6 +868,7 @@ |
scoped_refptr<TestURLRequestContext> context( |
new TestURLRequestContext(true)); |
context->set_network_delegate(&network_delegate); |
+ context->set_http_server_properties(NULL); |
context->Init(); |
TestURLRequest r(test_server_.GetURL(test_file), &d); |
@@ -939,6 +948,7 @@ |
public: |
HTTPSRequestTest() : default_context_(new TestURLRequestContext(true)) { |
default_context_->set_network_delegate(&default_network_delegate_); |
+ default_context_->set_http_server_properties(NULL); |
default_context_->Init(); |
} |
virtual ~HTTPSRequestTest() {} |
@@ -1961,6 +1971,7 @@ |
scoped_refptr<TestURLRequestContext> context( |
new TestURLRequestContext(true)); |
context->set_network_delegate(&network_delegate); |
+ context->set_http_server_properties(NULL); |
context->Init(); |
TestDelegate d; |
@@ -1987,6 +1998,7 @@ |
scoped_refptr<TestURLRequestContext> context( |
new TestURLRequestContext(true)); |
context->set_network_delegate(&network_delegate); |
+ context->set_http_server_properties(NULL); |
context->Init(); |
TestDelegate d; |
@@ -2999,6 +3011,7 @@ |
TestNetworkDelegate network_delegate; // must outlive URLRequests |
scoped_refptr<TestURLRequestContext> context(new TestURLRequestContext(true)); |
context->set_network_delegate(&network_delegate); |
+ context->set_http_server_properties(NULL); |
context->SetProxyFromString("myproxy:70"); |
context->set_host_resolver(&host_resolver); |
context->Init(); |
@@ -3415,6 +3428,7 @@ |
TestNetworkDelegate network_delegate; // must outlive URLRequests |
scoped_refptr<TestURLRequestContext> context(new TestURLRequestContext(true)); |
context->set_network_delegate(&network_delegate); |
+ context->set_http_server_properties(NULL); |
context->set_accept_language("en"); |
context->Init(); |
@@ -3433,6 +3447,7 @@ |
TestNetworkDelegate network_delegate; // must outlive URLRequests |
scoped_refptr<TestURLRequestContext> context(new TestURLRequestContext(true)); |
context->set_network_delegate(&network_delegate); |
+ context->set_http_server_properties(NULL); |
context->Init(); |
// We override the language after initialization because empty entries |
// get overridden by Init(). |
@@ -3500,6 +3515,7 @@ |
TestNetworkDelegate network_delegate; // must outlive URLRequests |
scoped_refptr<TestURLRequestContext> context(new TestURLRequestContext(true)); |
context->set_network_delegate(&network_delegate); |
+ context->set_http_server_properties(NULL); |
context->set_accept_charset("en"); |
context->Init(); |
@@ -3518,6 +3534,7 @@ |
TestNetworkDelegate network_delegate; // must outlive URLRequests |
scoped_refptr<TestURLRequestContext> context(new TestURLRequestContext(true)); |
context->set_network_delegate(&network_delegate); |
+ context->set_http_server_properties(NULL); |
context->Init(); |
// We override the accepted charset after initialization because empty |
// entries get overridden otherwise. |