| OLD | NEW |
| 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 "chrome/browser/io_thread.h" | 5 #include "chrome/browser/io_thread.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/base64.h" | 10 #include "base/base64.h" |
| (...skipping 866 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 877 builder.set_proxy_config_service(std::move(system_proxy_config_service_)); | 877 builder.set_proxy_config_service(std::move(system_proxy_config_service_)); |
| 878 | 878 |
| 879 builder.set_http_network_session_params(session_params_); | 879 builder.set_http_network_session_params(session_params_); |
| 880 | 880 |
| 881 builder.set_data_enabled(true); | 881 builder.set_data_enabled(true); |
| 882 builder.set_file_enabled(true); | 882 builder.set_file_enabled(true); |
| 883 #if !BUILDFLAG(DISABLE_FTP_SUPPORT) | 883 #if !BUILDFLAG(DISABLE_FTP_SUPPORT) |
| 884 builder.set_ftp_enabled(true); | 884 builder.set_ftp_enabled(true); |
| 885 #endif | 885 #endif |
| 886 | 886 |
| 887 builder.DisableHttpCache(); |
| 888 |
| 887 globals_->system_request_context = builder.Build(); | 889 globals_->system_request_context = builder.Build(); |
| 888 } | 890 } |
| 889 | 891 |
| 890 // static | 892 // static |
| 891 void IOThread::ConfigureParamsFromFieldTrialsAndCommandLine( | 893 void IOThread::ConfigureParamsFromFieldTrialsAndCommandLine( |
| 892 const base::CommandLine& command_line, | 894 const base::CommandLine& command_line, |
| 893 bool is_quic_allowed_by_policy, | 895 bool is_quic_allowed_by_policy, |
| 894 bool http_09_on_non_default_ports_enabled, | 896 bool http_09_on_non_default_ports_enabled, |
| 895 net::HttpNetworkSession::Params* params) { | 897 net::HttpNetworkSession::Params* params) { |
| 896 std::string quic_user_agent_id = chrome::GetChannelString(); | 898 std::string quic_user_agent_id = chrome::GetChannelString(); |
| (...skipping 10 matching lines...) Expand all Loading... |
| 907 if (command_line.HasSwitch(switches::kIgnoreUrlFetcherCertRequests)) | 909 if (command_line.HasSwitch(switches::kIgnoreUrlFetcherCertRequests)) |
| 908 net::URLFetcher::SetIgnoreCertificateRequests(true); | 910 net::URLFetcher::SetIgnoreCertificateRequests(true); |
| 909 | 911 |
| 910 params->http_09_on_non_default_ports_enabled = | 912 params->http_09_on_non_default_ports_enabled = |
| 911 http_09_on_non_default_ports_enabled; | 913 http_09_on_non_default_ports_enabled; |
| 912 } | 914 } |
| 913 | 915 |
| 914 metrics::UpdateUsagePrefCallbackType IOThread::GetMetricsDataUseForwarder() { | 916 metrics::UpdateUsagePrefCallbackType IOThread::GetMetricsDataUseForwarder() { |
| 915 return base::Bind(&UpdateMetricsUsagePrefsOnUIThread); | 917 return base::Bind(&UpdateMetricsUsagePrefsOnUIThread); |
| 916 } | 918 } |
| OLD | NEW |