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

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

Issue 1393713003: Remove insecure QUIC support from Chromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 2 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
« no previous file with comments | « net/url_request/url_request_context_builder.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_context_builder.h" 5 #include "net/url_request/url_request_context_builder.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 max_size(0) {} 170 max_size(0) {}
171 URLRequestContextBuilder::HttpCacheParams::~HttpCacheParams() {} 171 URLRequestContextBuilder::HttpCacheParams::~HttpCacheParams() {}
172 172
173 URLRequestContextBuilder::HttpNetworkSessionParams::HttpNetworkSessionParams() 173 URLRequestContextBuilder::HttpNetworkSessionParams::HttpNetworkSessionParams()
174 : ignore_certificate_errors(false), 174 : ignore_certificate_errors(false),
175 host_mapping_rules(NULL), 175 host_mapping_rules(NULL),
176 testing_fixed_http_port(0), 176 testing_fixed_http_port(0),
177 testing_fixed_https_port(0), 177 testing_fixed_https_port(0),
178 next_protos(NextProtosDefaults()), 178 next_protos(NextProtosDefaults()),
179 use_alternative_services(true), 179 use_alternative_services(true),
180 enable_quic(false), 180 enable_quic(false) {}
181 enable_insecure_quic(false) {}
182 181
183 URLRequestContextBuilder::HttpNetworkSessionParams::~HttpNetworkSessionParams() 182 URLRequestContextBuilder::HttpNetworkSessionParams::~HttpNetworkSessionParams()
184 {} 183 {}
185 184
186 URLRequestContextBuilder::SchemeFactory::SchemeFactory( 185 URLRequestContextBuilder::SchemeFactory::SchemeFactory(
187 const std::string& auth_scheme, 186 const std::string& auth_scheme,
188 HttpAuthHandlerFactory* auth_handler_factory) 187 HttpAuthHandlerFactory* auth_handler_factory)
189 : scheme(auth_scheme), factory(auth_handler_factory) { 188 : scheme(auth_scheme), factory(auth_handler_factory) {
190 } 189 }
191 190
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 network_session_params.testing_fixed_http_port = 382 network_session_params.testing_fixed_http_port =
384 http_network_session_params_.testing_fixed_http_port; 383 http_network_session_params_.testing_fixed_http_port;
385 network_session_params.testing_fixed_https_port = 384 network_session_params.testing_fixed_https_port =
386 http_network_session_params_.testing_fixed_https_port; 385 http_network_session_params_.testing_fixed_https_port;
387 network_session_params.use_alternative_services = 386 network_session_params.use_alternative_services =
388 http_network_session_params_.use_alternative_services; 387 http_network_session_params_.use_alternative_services;
389 network_session_params.trusted_spdy_proxy = 388 network_session_params.trusted_spdy_proxy =
390 http_network_session_params_.trusted_spdy_proxy; 389 http_network_session_params_.trusted_spdy_proxy;
391 network_session_params.next_protos = http_network_session_params_.next_protos; 390 network_session_params.next_protos = http_network_session_params_.next_protos;
392 network_session_params.enable_quic = http_network_session_params_.enable_quic; 391 network_session_params.enable_quic = http_network_session_params_.enable_quic;
393 network_session_params.enable_insecure_quic =
394 http_network_session_params_.enable_insecure_quic;
395 network_session_params.quic_connection_options = 392 network_session_params.quic_connection_options =
396 http_network_session_params_.quic_connection_options; 393 http_network_session_params_.quic_connection_options;
397 394
398 storage->set_http_network_session( 395 storage->set_http_network_session(
399 make_scoped_ptr(new HttpNetworkSession(network_session_params))); 396 make_scoped_ptr(new HttpNetworkSession(network_session_params)));
400 397
401 scoped_ptr<HttpTransactionFactory> http_transaction_factory; 398 scoped_ptr<HttpTransactionFactory> http_transaction_factory;
402 if (http_cache_enabled_) { 399 if (http_cache_enabled_) {
403 HttpCache::BackendFactory* http_cache_backend; 400 HttpCache::BackendFactory* http_cache_backend;
404 if (http_cache_params_.type == HttpCacheParams::DISK) { 401 if (http_cache_params_.type == HttpCacheParams::DISK) {
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 } 450 }
454 url_request_interceptors_.weak_clear(); 451 url_request_interceptors_.weak_clear();
455 } 452 }
456 storage->set_job_factory(top_job_factory.Pass()); 453 storage->set_job_factory(top_job_factory.Pass());
457 // TODO(willchan): Support sdch. 454 // TODO(willchan): Support sdch.
458 455
459 return context.Pass(); 456 return context.Pass();
460 } 457 }
461 458
462 } // namespace net 459 } // namespace net
OLDNEW
« no previous file with comments | « net/url_request/url_request_context_builder.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698