| Index: net/url_request/url_request_unittest.cc
|
| ===================================================================
|
| --- net/url_request/url_request_unittest.cc (revision 103555)
|
| +++ net/url_request/url_request_unittest.cc (working copy)
|
| @@ -205,6 +205,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();
|
| }
|
|
|
| @@ -315,6 +316,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;
|
| @@ -343,6 +345,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;
|
| @@ -376,6 +379,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();
|
|
|
| {
|
| @@ -404,6 +408,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();
|
|
|
| {
|
| @@ -434,6 +439,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();
|
|
|
| {
|
| @@ -468,6 +474,7 @@
|
|
|
| scoped_refptr<TestURLRequestContext> context(new TestURLRequestContext(true));
|
| context->set_network_delegate(&network_delegate);
|
| + context->set_http_server_properties(NULL);
|
| context->Init();
|
|
|
| {
|
| @@ -507,6 +514,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;
|
| @@ -600,6 +608,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);
|
| @@ -679,6 +688,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() {}
|
| @@ -1701,6 +1711,7 @@
|
| scoped_refptr<TestURLRequestContext> context(
|
| new TestURLRequestContext(true));
|
| context->set_network_delegate(&network_delegate);
|
| + context->set_http_server_properties(NULL);
|
| context->Init();
|
|
|
| TestDelegate d;
|
| @@ -1727,6 +1738,7 @@
|
| scoped_refptr<TestURLRequestContext> context(
|
| new TestURLRequestContext(true));
|
| context->set_network_delegate(&network_delegate);
|
| + context->set_http_server_properties(NULL);
|
| context->Init();
|
|
|
| TestDelegate d;
|
| @@ -2739,6 +2751,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();
|
| @@ -3155,6 +3168,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();
|
|
|
| @@ -3173,6 +3187,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().
|
| @@ -3240,6 +3255,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();
|
|
|
| @@ -3258,6 +3274,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.
|
|
|