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

Side by Side Diff: ios/web/shell/shell_url_request_context_getter.mm

Issue 2907463002: Split HttpNetworkSession::Params into two structs. (Closed)
Patch Set: Response to comments Created 3 years, 6 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "ios/web/shell/shell_url_request_context_getter.h" 5 #include "ios/web/shell/shell_url_request_context_getter.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/base_paths.h" 10 #include "base/base_paths.h"
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 std::unique_ptr<net::HttpServerProperties>( 113 std::unique_ptr<net::HttpServerProperties>(
114 new net::HttpServerPropertiesImpl())); 114 new net::HttpServerPropertiesImpl()));
115 115
116 std::unique_ptr<net::HostResolver> host_resolver( 116 std::unique_ptr<net::HostResolver> host_resolver(
117 net::HostResolver::CreateDefaultResolver( 117 net::HostResolver::CreateDefaultResolver(
118 url_request_context_->net_log())); 118 url_request_context_->net_log()));
119 storage_->set_http_auth_handler_factory( 119 storage_->set_http_auth_handler_factory(
120 net::HttpAuthHandlerFactory::CreateDefault(host_resolver.get())); 120 net::HttpAuthHandlerFactory::CreateDefault(host_resolver.get()));
121 storage_->set_host_resolver(std::move(host_resolver)); 121 storage_->set_host_resolver(std::move(host_resolver));
122 122
123 net::HttpNetworkSession::Params network_session_params; 123 net::HttpNetworkSession::Context network_session_context;
124 network_session_params.cert_verifier = 124 network_session_context.cert_verifier =
125 url_request_context_->cert_verifier(); 125 url_request_context_->cert_verifier();
126 network_session_params.transport_security_state = 126 network_session_context.transport_security_state =
127 url_request_context_->transport_security_state(); 127 url_request_context_->transport_security_state();
128 network_session_params.cert_transparency_verifier = 128 network_session_context.cert_transparency_verifier =
129 url_request_context_->cert_transparency_verifier(); 129 url_request_context_->cert_transparency_verifier();
130 network_session_params.ct_policy_enforcer = 130 network_session_context.ct_policy_enforcer =
131 url_request_context_->ct_policy_enforcer(); 131 url_request_context_->ct_policy_enforcer();
132 network_session_params.channel_id_service = 132 network_session_context.channel_id_service =
133 url_request_context_->channel_id_service(); 133 url_request_context_->channel_id_service();
134 network_session_params.net_log = url_request_context_->net_log(); 134 network_session_context.net_log = url_request_context_->net_log();
135 network_session_params.proxy_service = 135 network_session_context.proxy_service =
136 url_request_context_->proxy_service(); 136 url_request_context_->proxy_service();
137 network_session_params.ssl_config_service = 137 network_session_context.ssl_config_service =
138 url_request_context_->ssl_config_service(); 138 url_request_context_->ssl_config_service();
139 network_session_params.http_auth_handler_factory = 139 network_session_context.http_auth_handler_factory =
140 url_request_context_->http_auth_handler_factory(); 140 url_request_context_->http_auth_handler_factory();
141 network_session_params.http_server_properties = 141 network_session_context.http_server_properties =
142 url_request_context_->http_server_properties(); 142 url_request_context_->http_server_properties();
143 network_session_params.host_resolver = 143 network_session_context.host_resolver =
144 url_request_context_->host_resolver(); 144 url_request_context_->host_resolver();
145 145
146 base::FilePath cache_path = base_path_.Append(FILE_PATH_LITERAL("Cache")); 146 base::FilePath cache_path = base_path_.Append(FILE_PATH_LITERAL("Cache"));
147 std::unique_ptr<net::HttpCache::DefaultBackend> main_backend( 147 std::unique_ptr<net::HttpCache::DefaultBackend> main_backend(
148 new net::HttpCache::DefaultBackend(net::DISK_CACHE, 148 new net::HttpCache::DefaultBackend(net::DISK_CACHE,
149 net::CACHE_BACKEND_DEFAULT, 149 net::CACHE_BACKEND_DEFAULT,
150 cache_path, 0, cache_task_runner_)); 150 cache_path, 0, cache_task_runner_));
151 151
152 storage_->set_http_network_session( 152 storage_->set_http_network_session(
153 base::MakeUnique<net::HttpNetworkSession>(network_session_params)); 153 base::MakeUnique<net::HttpNetworkSession>(
154 net::HttpNetworkSession::Params(), network_session_context));
154 storage_->set_http_transaction_factory(base::MakeUnique<net::HttpCache>( 155 storage_->set_http_transaction_factory(base::MakeUnique<net::HttpCache>(
155 storage_->http_network_session(), std::move(main_backend), 156 storage_->http_network_session(), std::move(main_backend),
156 true /* set_up_quic_server_info */)); 157 true /* set_up_quic_server_info */));
157 158
158 std::unique_ptr<net::URLRequestJobFactoryImpl> job_factory( 159 std::unique_ptr<net::URLRequestJobFactoryImpl> job_factory(
159 new net::URLRequestJobFactoryImpl()); 160 new net::URLRequestJobFactoryImpl());
160 bool set_protocol = job_factory->SetProtocolHandler( 161 bool set_protocol = job_factory->SetProtocolHandler(
161 "data", base::WrapUnique(new net::DataProtocolHandler)); 162 "data", base::WrapUnique(new net::DataProtocolHandler));
162 DCHECK(set_protocol); 163 DCHECK(set_protocol);
163 164
164 storage_->set_job_factory(std::move(job_factory)); 165 storage_->set_job_factory(std::move(job_factory));
165 } 166 }
166 167
167 return url_request_context_.get(); 168 return url_request_context_.get();
168 } 169 }
169 170
170 scoped_refptr<base::SingleThreadTaskRunner> 171 scoped_refptr<base::SingleThreadTaskRunner>
171 ShellURLRequestContextGetter::GetNetworkTaskRunner() const { 172 ShellURLRequestContextGetter::GetNetworkTaskRunner() const {
172 return network_task_runner_; 173 return network_task_runner_;
173 } 174 }
174 175
175 } // namespace web 176 } // namespace web
OLDNEW
« no previous file with comments | « ios/crnet/crnet_environment.mm ('k') | ios/web_view/internal/web_view_url_request_context_getter.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698