| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 // A standalone tool for testing MCS connections and the MCS client on their | 5 // A standalone tool for testing MCS connections and the MCS client on their |
| 6 // own. | 6 // own. |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <cstddef> | 10 #include <cstddef> |
| (...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 410 } | 410 } |
| 411 | 411 |
| 412 void MCSProbe::BuildNetworkSession() { | 412 void MCSProbe::BuildNetworkSession() { |
| 413 net::HttpNetworkSession::Params session_params; | 413 net::HttpNetworkSession::Params session_params; |
| 414 session_params.host_resolver = host_resolver_.get(); | 414 session_params.host_resolver = host_resolver_.get(); |
| 415 session_params.cert_verifier = cert_verifier_.get(); | 415 session_params.cert_verifier = cert_verifier_.get(); |
| 416 session_params.channel_id_service = system_channel_id_service_.get(); | 416 session_params.channel_id_service = system_channel_id_service_.get(); |
| 417 session_params.transport_security_state = transport_security_state_.get(); | 417 session_params.transport_security_state = transport_security_state_.get(); |
| 418 session_params.ssl_config_service = new net::SSLConfigServiceDefaults(); | 418 session_params.ssl_config_service = new net::SSLConfigServiceDefaults(); |
| 419 session_params.http_auth_handler_factory = http_auth_handler_factory_.get(); | 419 session_params.http_auth_handler_factory = http_auth_handler_factory_.get(); |
| 420 session_params.http_server_properties = | 420 session_params.http_server_properties = http_server_properties_.get(); |
| 421 http_server_properties_->GetWeakPtr(); | |
| 422 session_params.host_mapping_rules = host_mapping_rules_.get(); | 421 session_params.host_mapping_rules = host_mapping_rules_.get(); |
| 423 session_params.ignore_certificate_errors = true; | 422 session_params.ignore_certificate_errors = true; |
| 424 session_params.testing_fixed_http_port = 0; | 423 session_params.testing_fixed_http_port = 0; |
| 425 session_params.testing_fixed_https_port = 0; | 424 session_params.testing_fixed_https_port = 0; |
| 426 session_params.net_log = &net_log_; | 425 session_params.net_log = &net_log_; |
| 427 session_params.proxy_service = proxy_service_.get(); | 426 session_params.proxy_service = proxy_service_.get(); |
| 428 | 427 |
| 429 network_session_.reset(new net::HttpNetworkSession(session_params)); | 428 network_session_.reset(new net::HttpNetworkSession(session_params)); |
| 430 } | 429 } |
| 431 | 430 |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 513 | 512 |
| 514 return 0; | 513 return 0; |
| 515 } | 514 } |
| 516 | 515 |
| 517 } // namespace | 516 } // namespace |
| 518 } // namespace gcm | 517 } // namespace gcm |
| 519 | 518 |
| 520 int main(int argc, char* argv[]) { | 519 int main(int argc, char* argv[]) { |
| 521 return gcm::MCSProbeMain(argc, argv); | 520 return gcm::MCSProbeMain(argc, argv); |
| 522 } | 521 } |
| OLD | NEW |