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

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

Issue 1547273003: Set trusted SPDY proxy dynamically on per-profile basis (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added net/base/test_proxy_delegate.{h,cc} Created 4 years, 10 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 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/memory/scoped_ptr.h"
15 #include "base/single_thread_task_runner.h" 14 #include "base/single_thread_task_runner.h"
16 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
17 #include "base/thread_task_runner_handle.h" 16 #include "base/thread_task_runner_handle.h"
18 #include "base/threading/thread.h" 17 #include "base/threading/thread.h"
19 #include "net/base/cache_type.h" 18 #include "net/base/cache_type.h"
20 #include "net/base/net_errors.h" 19 #include "net/base/net_errors.h"
21 #include "net/base/network_delegate_impl.h" 20 #include "net/base/network_delegate_impl.h"
22 #include "net/base/sdch_manager.h" 21 #include "net/base/sdch_manager.h"
23 #include "net/cert/cert_verifier.h" 22 #include "net/cert/cert_verifier.h"
24 #include "net/cookies/cookie_monster.h" 23 #include "net/cookies/cookie_monster.h"
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 network_session_params.host_mapping_rules = 383 network_session_params.host_mapping_rules =
385 http_network_session_params_.host_mapping_rules; 384 http_network_session_params_.host_mapping_rules;
386 network_session_params.testing_fixed_http_port = 385 network_session_params.testing_fixed_http_port =
387 http_network_session_params_.testing_fixed_http_port; 386 http_network_session_params_.testing_fixed_http_port;
388 network_session_params.testing_fixed_https_port = 387 network_session_params.testing_fixed_https_port =
389 http_network_session_params_.testing_fixed_https_port; 388 http_network_session_params_.testing_fixed_https_port;
390 network_session_params.enable_spdy31 = 389 network_session_params.enable_spdy31 =
391 http_network_session_params_.enable_spdy31; 390 http_network_session_params_.enable_spdy31;
392 network_session_params.enable_http2 = 391 network_session_params.enable_http2 =
393 http_network_session_params_.enable_http2; 392 http_network_session_params_.enable_http2;
394 network_session_params.trusted_spdy_proxy =
395 http_network_session_params_.trusted_spdy_proxy;
396 network_session_params.parse_alternative_services = 393 network_session_params.parse_alternative_services =
397 http_network_session_params_.parse_alternative_services; 394 http_network_session_params_.parse_alternative_services;
398 network_session_params.enable_alternative_service_with_different_host = 395 network_session_params.enable_alternative_service_with_different_host =
399 http_network_session_params_ 396 http_network_session_params_
400 .enable_alternative_service_with_different_host; 397 .enable_alternative_service_with_different_host;
401 network_session_params.enable_quic = http_network_session_params_.enable_quic; 398 network_session_params.enable_quic = http_network_session_params_.enable_quic;
402 network_session_params.quic_max_server_configs_stored_in_properties = 399 network_session_params.quic_max_server_configs_stored_in_properties =
403 http_network_session_params_.quic_max_server_configs_stored_in_properties; 400 http_network_session_params_.quic_max_server_configs_stored_in_properties;
404 network_session_params.quic_delay_tcp_race = 401 network_session_params.quic_delay_tcp_race =
405 http_network_session_params_.quic_delay_tcp_race; 402 http_network_session_params_.quic_delay_tcp_race;
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
475 } 472 }
476 url_request_interceptors_.clear(); 473 url_request_interceptors_.clear();
477 } 474 }
478 storage->set_job_factory(std::move(top_job_factory)); 475 storage->set_job_factory(std::move(top_job_factory));
479 // TODO(willchan): Support sdch. 476 // TODO(willchan): Support sdch.
480 477
481 return std::move(context); 478 return std::move(context);
482 } 479 }
483 480
484 } // namespace net 481 } // 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