OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "net/url_request/url_request_test_util.h" | 5 #include "net/url_request/url_request_test_util.h" |
6 | 6 |
7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
10 #include "base/threading/thread.h" | 10 #include "base/threading/thread.h" |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
118 context_storage_.set_http_auth_handler_factory( | 118 context_storage_.set_http_auth_handler_factory( |
119 net::HttpAuthHandlerFactory::CreateDefault(host_resolver())); | 119 net::HttpAuthHandlerFactory::CreateDefault(host_resolver())); |
120 } | 120 } |
121 net::HttpNetworkSession::Params params; | 121 net::HttpNetworkSession::Params params; |
122 params.host_resolver = host_resolver(); | 122 params.host_resolver = host_resolver(); |
123 params.cert_verifier = cert_verifier(); | 123 params.cert_verifier = cert_verifier(); |
124 params.proxy_service = proxy_service(); | 124 params.proxy_service = proxy_service(); |
125 params.ssl_config_service = ssl_config_service(); | 125 params.ssl_config_service = ssl_config_service(); |
126 params.http_auth_handler_factory = http_auth_handler_factory(); | 126 params.http_auth_handler_factory = http_auth_handler_factory(); |
127 params.network_delegate = network_delegate(); | 127 params.network_delegate = network_delegate(); |
| 128 params.http_server_properties = http_server_properties(); |
128 | 129 |
129 if (!http_transaction_factory()) { | 130 if (!http_transaction_factory()) { |
130 context_storage_.set_http_transaction_factory(new net::HttpCache( | 131 context_storage_.set_http_transaction_factory(new net::HttpCache( |
131 new net::HttpNetworkSession(params), | 132 new net::HttpNetworkSession(params), |
132 net::HttpCache::DefaultBackend::InMemory(0))); | 133 net::HttpCache::DefaultBackend::InMemory(0))); |
133 } | 134 } |
134 // In-memory cookie store. | 135 // In-memory cookie store. |
135 if (!cookie_store()) | 136 if (!cookie_store()) |
136 context_storage_.set_cookie_store(new net::CookieMonster(NULL, NULL)); | 137 context_storage_.set_cookie_store(new net::CookieMonster(NULL, NULL)); |
137 if (accept_language().empty()) | 138 if (accept_language().empty()) |
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
481 event_order_[req_id] += "OnAuthRequired\n"; | 482 event_order_[req_id] += "OnAuthRequired\n"; |
482 EXPECT_TRUE(next_states_[req_id] & kStageAuthRequired) << | 483 EXPECT_TRUE(next_states_[req_id] & kStageAuthRequired) << |
483 event_order_[req_id]; | 484 event_order_[req_id]; |
484 next_states_[req_id] = kStageBeforeSendHeaders | | 485 next_states_[req_id] = kStageBeforeSendHeaders | |
485 kStageHeadersReceived | // Request canceled by delegate simulates empty | 486 kStageHeadersReceived | // Request canceled by delegate simulates empty |
486 // response. | 487 // response. |
487 kStageResponseStarted | // data: URLs do not trigger sending headers | 488 kStageResponseStarted | // data: URLs do not trigger sending headers |
488 kStageBeforeRedirect; // a delegate can trigger a redirection | 489 kStageBeforeRedirect; // a delegate can trigger a redirection |
489 return net::NetworkDelegate::AUTH_REQUIRED_RESPONSE_NO_ACTION; | 490 return net::NetworkDelegate::AUTH_REQUIRED_RESPONSE_NO_ACTION; |
490 } | 491 } |
OLD | NEW |