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

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: Cleanup 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
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 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 network_session_params.testing_fixed_http_port = 373 network_session_params.testing_fixed_http_port =
375 http_network_session_params_.testing_fixed_http_port; 374 http_network_session_params_.testing_fixed_http_port;
376 network_session_params.testing_fixed_https_port = 375 network_session_params.testing_fixed_https_port =
377 http_network_session_params_.testing_fixed_https_port; 376 http_network_session_params_.testing_fixed_https_port;
378 network_session_params.use_alternative_services = 377 network_session_params.use_alternative_services =
379 http_network_session_params_.use_alternative_services; 378 http_network_session_params_.use_alternative_services;
380 network_session_params.trusted_spdy_proxy = 379 network_session_params.trusted_spdy_proxy =
381 http_network_session_params_.trusted_spdy_proxy; 380 http_network_session_params_.trusted_spdy_proxy;
382 network_session_params.next_protos = http_network_session_params_.next_protos; 381 network_session_params.next_protos = http_network_session_params_.next_protos;
383 network_session_params.enable_quic = http_network_session_params_.enable_quic; 382 network_session_params.enable_quic = http_network_session_params_.enable_quic;
384 network_session_params.enable_insecure_quic =
385 http_network_session_params_.enable_insecure_quic;
386 network_session_params.quic_connection_options = 383 network_session_params.quic_connection_options =
387 http_network_session_params_.quic_connection_options; 384 http_network_session_params_.quic_connection_options;
388 385
389 scoped_ptr<HttpTransactionFactory> http_transaction_factory; 386 scoped_ptr<HttpTransactionFactory> http_transaction_factory;
390 if (http_cache_enabled_) { 387 if (http_cache_enabled_) {
391 HttpCache::BackendFactory* http_cache_backend = NULL; 388 HttpCache::BackendFactory* http_cache_backend = NULL;
392 if (http_cache_params_.type == HttpCacheParams::DISK) { 389 if (http_cache_params_.type == HttpCacheParams::DISK) {
393 http_cache_backend = new HttpCache::DefaultBackend( 390 http_cache_backend = new HttpCache::DefaultBackend(
394 DISK_CACHE, CACHE_BACKEND_DEFAULT, http_cache_params_.path, 391 DISK_CACHE, CACHE_BACKEND_DEFAULT, http_cache_params_.path,
395 http_cache_params_.max_size, context->GetFileTaskRunner()); 392 http_cache_params_.max_size, context->GetFileTaskRunner());
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 } 440 }
444 url_request_interceptors_.weak_clear(); 441 url_request_interceptors_.weak_clear();
445 } 442 }
446 storage->set_job_factory(top_job_factory.Pass()); 443 storage->set_job_factory(top_job_factory.Pass());
447 // TODO(willchan): Support sdch. 444 // TODO(willchan): Support sdch.
448 445
449 return context.Pass(); 446 return context.Pass();
450 } 447 }
451 448
452 } // namespace net 449 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698