Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Side by Side Diff: net/url_request/url_request_test_util.cc

Issue 1579063002: Implement a skeleton version of Expect CT reports (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove unnecessary (?) NET_EXPORTs Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <utility> 7 #include <utility>
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/location.h" 10 #include "base/location.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
13 #include "base/single_thread_task_runner.h" 13 #include "base/single_thread_task_runner.h"
14 #include "base/thread_task_runner_handle.h" 14 #include "base/thread_task_runner_handle.h"
15 #include "base/threading/thread.h" 15 #include "base/threading/thread.h"
16 #include "base/threading/worker_pool.h" 16 #include "base/threading/worker_pool.h"
17 #include "net/base/host_port_pair.h" 17 #include "net/base/host_port_pair.h"
18 #include "net/cert/cert_verifier.h" 18 #include "net/cert/cert_verifier.h"
19 #include "net/cert/ct_verifier.h"
19 #include "net/dns/mock_host_resolver.h" 20 #include "net/dns/mock_host_resolver.h"
20 #include "net/http/http_network_session.h" 21 #include "net/http/http_network_session.h"
21 #include "net/http/http_response_headers.h" 22 #include "net/http/http_response_headers.h"
22 #include "net/http/http_server_properties_impl.h" 23 #include "net/http/http_server_properties_impl.h"
23 #include "net/http/transport_security_state.h" 24 #include "net/http/transport_security_state.h"
24 #include "net/ssl/channel_id_service.h" 25 #include "net/ssl/channel_id_service.h"
25 #include "net/ssl/default_channel_id_store.h" 26 #include "net/ssl/default_channel_id_store.h"
26 #include "net/url_request/static_http_user_agent_settings.h" 27 #include "net/url_request/static_http_user_agent_settings.h"
27 #include "net/url_request/url_request_job.h" 28 #include "net/url_request/url_request_job.h"
28 #include "net/url_request/url_request_job_factory_impl.h" 29 #include "net/url_request/url_request_job_factory_impl.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 EXPECT_FALSE(client_socket_factory_); 102 EXPECT_FALSE(client_socket_factory_);
102 } else { 103 } else {
103 HttpNetworkSession::Params params; 104 HttpNetworkSession::Params params;
104 105
105 if (http_network_session_params_) 106 if (http_network_session_params_)
106 params = *http_network_session_params_; 107 params = *http_network_session_params_;
107 params.client_socket_factory = client_socket_factory(); 108 params.client_socket_factory = client_socket_factory();
108 params.proxy_delegate = proxy_delegate(); 109 params.proxy_delegate = proxy_delegate();
109 params.host_resolver = host_resolver(); 110 params.host_resolver = host_resolver();
110 params.cert_verifier = cert_verifier(); 111 params.cert_verifier = cert_verifier();
112 params.cert_transparency_verifier = cert_transparency_verifier();
113 if (ct_policy_enforcer())
114 params.ct_policy_enforcer = ct_policy_enforcer();
111 params.transport_security_state = transport_security_state(); 115 params.transport_security_state = transport_security_state();
112 params.proxy_service = proxy_service(); 116 params.proxy_service = proxy_service();
113 params.ssl_config_service = ssl_config_service(); 117 params.ssl_config_service = ssl_config_service();
114 params.http_auth_handler_factory = http_auth_handler_factory(); 118 params.http_auth_handler_factory = http_auth_handler_factory();
115 params.network_delegate = network_delegate(); 119 params.network_delegate = network_delegate();
116 params.http_server_properties = http_server_properties(); 120 params.http_server_properties = http_server_properties();
117 params.net_log = net_log(); 121 params.net_log = net_log();
118 params.channel_id_service = channel_id_service(); 122 params.channel_id_service = channel_id_service();
119 context_storage_.set_http_network_session( 123 context_storage_.set_http_network_session(
120 make_scoped_ptr(new HttpNetworkSession(params))); 124 make_scoped_ptr(new HttpNetworkSession(params)));
(...skipping 532 matching lines...) Expand 10 before | Expand all | Expand 10 after
653 URLRequest* request, 657 URLRequest* request,
654 NetworkDelegate* network_delegate) const { 658 NetworkDelegate* network_delegate) const {
655 return main_intercept_job_.release(); 659 return main_intercept_job_.release();
656 } 660 }
657 661
658 void TestJobInterceptor::set_main_intercept_job(scoped_ptr<URLRequestJob> job) { 662 void TestJobInterceptor::set_main_intercept_job(scoped_ptr<URLRequestJob> job) {
659 main_intercept_job_ = std::move(job); 663 main_intercept_job_ = std::move(job);
660 } 664 }
661 665
662 } // namespace net 666 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698