| 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/net/connection_tester.h" | 5 #include "chrome/browser/net/connection_tester.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 // Create a custom ProxyService for this this experiment. | 65 // Create a custom ProxyService for this this experiment. |
| 66 scoped_ptr<net::ProxyService> proxy_service_tmp; | 66 scoped_ptr<net::ProxyService> proxy_service_tmp; |
| 67 rv = CreateProxyService(experiment.proxy_settings_experiment, | 67 rv = CreateProxyService(experiment.proxy_settings_experiment, |
| 68 &proxy_service_tmp); | 68 &proxy_service_tmp); |
| 69 if (rv != net::OK) | 69 if (rv != net::OK) |
| 70 return rv; // Failure. | 70 return rv; // Failure. |
| 71 storage_.set_proxy_service(proxy_service_tmp.release()); | 71 storage_.set_proxy_service(proxy_service_tmp.release()); |
| 72 | 72 |
| 73 // The rest of the dependencies are standard, and don't depend on the | 73 // The rest of the dependencies are standard, and don't depend on the |
| 74 // experiment being run. | 74 // experiment being run. |
| 75 storage_.set_cert_verifier(new net::CertVerifier); | 75 storage_.set_cert_verifier(net::CertVerifier::CreateDefault()); |
| 76 storage_.set_ftp_transaction_factory( | 76 storage_.set_ftp_transaction_factory( |
| 77 new net::FtpNetworkLayer(host_resolver())); | 77 new net::FtpNetworkLayer(host_resolver())); |
| 78 storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults); | 78 storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults); |
| 79 storage_.set_http_auth_handler_factory( | 79 storage_.set_http_auth_handler_factory( |
| 80 net::HttpAuthHandlerFactory::CreateDefault(host_resolver())); | 80 net::HttpAuthHandlerFactory::CreateDefault(host_resolver())); |
| 81 storage_.set_http_server_properties(new net::HttpServerPropertiesImpl); | 81 storage_.set_http_server_properties(new net::HttpServerPropertiesImpl); |
| 82 | 82 |
| 83 net::HttpNetworkSession::Params session_params; | 83 net::HttpNetworkSession::Params session_params; |
| 84 session_params.host_resolver = host_resolver(); | 84 session_params.host_resolver = host_resolver(); |
| 85 session_params.cert_verifier = cert_verifier(); | 85 session_params.cert_verifier = cert_verifier(); |
| (...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 469 | 469 |
| 470 // Notify the delegate of completion. | 470 // Notify the delegate of completion. |
| 471 delegate_->OnCompletedConnectionTestExperiment(current, result); | 471 delegate_->OnCompletedConnectionTestExperiment(current, result); |
| 472 | 472 |
| 473 if (remaining_experiments_.empty()) { | 473 if (remaining_experiments_.empty()) { |
| 474 delegate_->OnCompletedConnectionTestSuite(); | 474 delegate_->OnCompletedConnectionTestSuite(); |
| 475 } else { | 475 } else { |
| 476 StartNextExperiment(); | 476 StartNextExperiment(); |
| 477 } | 477 } |
| 478 } | 478 } |
| OLD | NEW |