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 396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
407 } | 407 } |
408 | 408 |
409 void MCSProbe::BuildNetworkSession() { | 409 void MCSProbe::BuildNetworkSession() { |
410 net::HttpNetworkSession::Params session_params; | 410 net::HttpNetworkSession::Params session_params; |
411 session_params.host_resolver = host_resolver_.get(); | 411 session_params.host_resolver = host_resolver_.get(); |
412 session_params.cert_verifier = cert_verifier_.get(); | 412 session_params.cert_verifier = cert_verifier_.get(); |
413 session_params.channel_id_service = system_channel_id_service_.get(); | 413 session_params.channel_id_service = system_channel_id_service_.get(); |
414 session_params.transport_security_state = transport_security_state_.get(); | 414 session_params.transport_security_state = transport_security_state_.get(); |
415 session_params.ssl_config_service = new net::SSLConfigServiceDefaults(); | 415 session_params.ssl_config_service = new net::SSLConfigServiceDefaults(); |
416 session_params.http_auth_handler_factory = http_auth_handler_factory_.get(); | 416 session_params.http_auth_handler_factory = http_auth_handler_factory_.get(); |
417 session_params.http_server_properties = | 417 session_params.http_server_properties = http_server_properties_.get(); |
418 http_server_properties_->GetWeakPtr(); | |
419 session_params.host_mapping_rules = host_mapping_rules_.get(); | 418 session_params.host_mapping_rules = host_mapping_rules_.get(); |
420 session_params.ignore_certificate_errors = true; | 419 session_params.ignore_certificate_errors = true; |
421 session_params.testing_fixed_http_port = 0; | 420 session_params.testing_fixed_http_port = 0; |
422 session_params.testing_fixed_https_port = 0; | 421 session_params.testing_fixed_https_port = 0; |
423 session_params.net_log = &net_log_; | 422 session_params.net_log = &net_log_; |
424 session_params.proxy_service = proxy_service_.get(); | 423 session_params.proxy_service = proxy_service_.get(); |
425 | 424 |
426 network_session_.reset(new net::HttpNetworkSession(session_params)); | 425 network_session_.reset(new net::HttpNetworkSession(session_params)); |
427 } | 426 } |
428 | 427 |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
509 | 508 |
510 return 0; | 509 return 0; |
511 } | 510 } |
512 | 511 |
513 } // namespace | 512 } // namespace |
514 } // namespace gcm | 513 } // namespace gcm |
515 | 514 |
516 int main(int argc, char* argv[]) { | 515 int main(int argc, char* argv[]) { |
517 return gcm::MCSProbeMain(argc, argv); | 516 return gcm::MCSProbeMain(argc, argv); |
518 } | 517 } |
OLD | NEW |