OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 if (!ssl_config_service()) | 77 if (!ssl_config_service()) |
78 context_storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults); | 78 context_storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults); |
79 if (!http_auth_handler_factory()) { | 79 if (!http_auth_handler_factory()) { |
80 context_storage_.set_http_auth_handler_factory( | 80 context_storage_.set_http_auth_handler_factory( |
81 net::HttpAuthHandlerFactory::CreateDefault(host_resolver())); | 81 net::HttpAuthHandlerFactory::CreateDefault(host_resolver())); |
82 } | 82 } |
83 if (!http_server_properties()) { | 83 if (!http_server_properties()) { |
84 context_storage_.set_http_server_properties( | 84 context_storage_.set_http_server_properties( |
85 new net::HttpServerPropertiesImpl); | 85 new net::HttpServerPropertiesImpl); |
86 } | 86 } |
| 87 if (!transport_security_state()) { |
| 88 context_storage_.set_transport_security_state( |
| 89 new net::TransportSecurityState()); |
| 90 } |
87 net::HttpNetworkSession::Params params; | 91 net::HttpNetworkSession::Params params; |
88 params.host_resolver = host_resolver(); | 92 params.host_resolver = host_resolver(); |
89 params.cert_verifier = cert_verifier(); | 93 params.cert_verifier = cert_verifier(); |
90 params.proxy_service = proxy_service(); | 94 params.proxy_service = proxy_service(); |
91 params.ssl_config_service = ssl_config_service(); | 95 params.ssl_config_service = ssl_config_service(); |
92 params.http_auth_handler_factory = http_auth_handler_factory(); | 96 params.http_auth_handler_factory = http_auth_handler_factory(); |
93 params.network_delegate = network_delegate(); | 97 params.network_delegate = network_delegate(); |
94 params.http_server_properties = http_server_properties(); | 98 params.http_server_properties = http_server_properties(); |
95 | 99 |
96 if (!http_transaction_factory()) { | 100 if (!http_transaction_factory()) { |
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
550 | 554 |
551 net::URLRequestJob* TestJobInterceptor::MaybeInterceptResponse( | 555 net::URLRequestJob* TestJobInterceptor::MaybeInterceptResponse( |
552 net::URLRequest* request, | 556 net::URLRequest* request, |
553 net::NetworkDelegate* network_delegate) const { | 557 net::NetworkDelegate* network_delegate) const { |
554 return NULL; | 558 return NULL; |
555 } | 559 } |
556 | 560 |
557 void TestJobInterceptor::set_main_intercept_job(net::URLRequestJob* job) { | 561 void TestJobInterceptor::set_main_intercept_job(net::URLRequestJob* job) { |
558 main_intercept_job_ = job; | 562 main_intercept_job_ = job; |
559 } | 563 } |
OLD | NEW |