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

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

Issue 2546533003: Respect QuicAllowed policy for new streams (Closed)
Patch Set: IOS io_thread also initializes DynamicSharedParams Created 3 years, 12 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 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 network_session_params.ignore_certificate_errors = 415 network_session_params.ignore_certificate_errors =
416 http_network_session_params_.ignore_certificate_errors; 416 http_network_session_params_.ignore_certificate_errors;
417 network_session_params.host_mapping_rules = 417 network_session_params.host_mapping_rules =
418 http_network_session_params_.host_mapping_rules; 418 http_network_session_params_.host_mapping_rules;
419 network_session_params.testing_fixed_http_port = 419 network_session_params.testing_fixed_http_port =
420 http_network_session_params_.testing_fixed_http_port; 420 http_network_session_params_.testing_fixed_http_port;
421 network_session_params.testing_fixed_https_port = 421 network_session_params.testing_fixed_https_port =
422 http_network_session_params_.testing_fixed_https_port; 422 http_network_session_params_.testing_fixed_https_port;
423 network_session_params.enable_http2 = 423 network_session_params.enable_http2 =
424 http_network_session_params_.enable_http2; 424 http_network_session_params_.enable_http2;
425 network_session_params.enable_quic = http_network_session_params_.enable_quic;
426 network_session_params.quic_max_server_configs_stored_in_properties = 425 network_session_params.quic_max_server_configs_stored_in_properties =
427 http_network_session_params_.quic_max_server_configs_stored_in_properties; 426 http_network_session_params_.quic_max_server_configs_stored_in_properties;
428 network_session_params.quic_delay_tcp_race = 427 network_session_params.quic_delay_tcp_race =
429 http_network_session_params_.quic_delay_tcp_race; 428 http_network_session_params_.quic_delay_tcp_race;
430 network_session_params.quic_idle_connection_timeout_seconds = 429 network_session_params.quic_idle_connection_timeout_seconds =
431 http_network_session_params_.quic_idle_connection_timeout_seconds; 430 http_network_session_params_.quic_idle_connection_timeout_seconds;
432 network_session_params.quic_connection_options = 431 network_session_params.quic_connection_options =
433 http_network_session_params_.quic_connection_options; 432 http_network_session_params_.quic_connection_options;
434 network_session_params.quic_host_whitelist = 433 network_session_params.quic_host_whitelist =
435 http_network_session_params_.quic_host_whitelist; 434 http_network_session_params_.quic_host_whitelist;
(...skipping 13 matching lines...) Expand all
449 http_network_session_params_.quic_race_cert_verification; 448 http_network_session_params_.quic_race_cert_verification;
450 if (proxy_delegate_) { 449 if (proxy_delegate_) {
451 network_session_params.proxy_delegate = proxy_delegate_.get(); 450 network_session_params.proxy_delegate = proxy_delegate_.get();
452 storage->set_proxy_delegate(std::move(proxy_delegate_)); 451 storage->set_proxy_delegate(std::move(proxy_delegate_));
453 } 452 }
454 if (socket_performance_watcher_factory_) { 453 if (socket_performance_watcher_factory_) {
455 network_session_params.socket_performance_watcher_factory = 454 network_session_params.socket_performance_watcher_factory =
456 socket_performance_watcher_factory_; 455 socket_performance_watcher_factory_;
457 } 456 }
458 457
458 auto network_session_dynamic_params =
459 base::MakeUnique<HttpNetworkSession::DynamicSharedParams>();
460 network_session_dynamic_params->enable_quic =
461 http_network_session_params_.enable_quic;
462 network_session_params.dynamic_shared_params =
463 network_session_dynamic_params.get();
464
459 storage->set_http_network_session( 465 storage->set_http_network_session(
460 base::MakeUnique<HttpNetworkSession>(network_session_params)); 466 base::MakeUnique<HttpNetworkSession>(network_session_params));
467 storage->set_http_network_session_dynamic_shared_params(
468 std::move(network_session_dynamic_params));
461 469
462 std::unique_ptr<HttpTransactionFactory> http_transaction_factory; 470 std::unique_ptr<HttpTransactionFactory> http_transaction_factory;
463 if (http_cache_enabled_) { 471 if (http_cache_enabled_) {
464 std::unique_ptr<HttpCache::BackendFactory> http_cache_backend; 472 std::unique_ptr<HttpCache::BackendFactory> http_cache_backend;
465 if (http_cache_params_.type != HttpCacheParams::IN_MEMORY) { 473 if (http_cache_params_.type != HttpCacheParams::IN_MEMORY) {
466 BackendType backend_type = 474 BackendType backend_type =
467 http_cache_params_.type == HttpCacheParams::DISK 475 http_cache_params_.type == HttpCacheParams::DISK
468 ? CACHE_BACKEND_DEFAULT 476 ? CACHE_BACKEND_DEFAULT
469 : CACHE_BACKEND_SIMPLE; 477 : CACHE_BACKEND_SIMPLE;
470 http_cache_backend.reset(new HttpCache::DefaultBackend( 478 http_cache_backend.reset(new HttpCache::DefaultBackend(
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 } 530 }
523 url_request_interceptors_.clear(); 531 url_request_interceptors_.clear();
524 } 532 }
525 storage->set_job_factory(std::move(top_job_factory)); 533 storage->set_job_factory(std::move(top_job_factory));
526 // TODO(willchan): Support sdch. 534 // TODO(willchan): Support sdch.
527 535
528 return std::move(context); 536 return std::move(context);
529 } 537 }
530 538
531 } // namespace net 539 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698