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