| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "ios/chrome/browser/ios_chrome_io_thread.h" | 5 #include "ios/chrome/browser/ios_chrome_io_thread.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 389 if (command_line.HasSwitch(switches::kIOSTestingFixedHttpPort)) { | 389 if (command_line.HasSwitch(switches::kIOSTestingFixedHttpPort)) { |
| 390 params_.testing_fixed_http_port = | 390 params_.testing_fixed_http_port = |
| 391 GetSwitchValueAsInt(command_line, switches::kIOSTestingFixedHttpPort); | 391 GetSwitchValueAsInt(command_line, switches::kIOSTestingFixedHttpPort); |
| 392 } | 392 } |
| 393 if (command_line.HasSwitch(switches::kIOSTestingFixedHttpsPort)) { | 393 if (command_line.HasSwitch(switches::kIOSTestingFixedHttpsPort)) { |
| 394 params_.testing_fixed_https_port = | 394 params_.testing_fixed_https_port = |
| 395 GetSwitchValueAsInt(command_line, switches::kIOSTestingFixedHttpsPort); | 395 GetSwitchValueAsInt(command_line, switches::kIOSTestingFixedHttpsPort); |
| 396 } | 396 } |
| 397 | 397 |
| 398 params_.ignore_certificate_errors = false; | 398 params_.ignore_certificate_errors = false; |
| 399 params_.enable_quic_port_selection = false; | |
| 400 params_.enable_user_alternate_protocol_ports = false; | 399 params_.enable_user_alternate_protocol_ports = false; |
| 401 | 400 |
| 402 std::string quic_user_agent_id = ::GetChannelString(); | 401 std::string quic_user_agent_id = ::GetChannelString(); |
| 403 if (!quic_user_agent_id.empty()) | 402 if (!quic_user_agent_id.empty()) |
| 404 quic_user_agent_id.push_back(' '); | 403 quic_user_agent_id.push_back(' '); |
| 405 quic_user_agent_id.append( | 404 quic_user_agent_id.append( |
| 406 version_info::GetProductNameAndVersionForUserAgent()); | 405 version_info::GetProductNameAndVersionForUserAgent()); |
| 407 quic_user_agent_id.push_back(' '); | 406 quic_user_agent_id.push_back(' '); |
| 408 quic_user_agent_id.append(web::BuildOSCpuInfo()); | 407 quic_user_agent_id.append(web::BuildOSCpuInfo()); |
| 409 | 408 |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 564 | 563 |
| 565 globals->system_http_network_session.reset( | 564 globals->system_http_network_session.reset( |
| 566 new net::HttpNetworkSession(system_params)); | 565 new net::HttpNetworkSession(system_params)); |
| 567 globals->system_http_transaction_factory.reset( | 566 globals->system_http_transaction_factory.reset( |
| 568 new net::HttpNetworkLayer(globals->system_http_network_session.get())); | 567 new net::HttpNetworkLayer(globals->system_http_network_session.get())); |
| 569 context->set_http_transaction_factory( | 568 context->set_http_transaction_factory( |
| 570 globals->system_http_transaction_factory.get()); | 569 globals->system_http_transaction_factory.get()); |
| 571 | 570 |
| 572 return context; | 571 return context; |
| 573 } | 572 } |
| OLD | NEW |