OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 #include "net/base/net_util.h" | 23 #include "net/base/net_util.h" |
24 #include "net/base/ssl_config_service_defaults.h" | 24 #include "net/base/ssl_config_service_defaults.h" |
25 #include "net/ftp/ftp_network_layer.h" | 25 #include "net/ftp/ftp_network_layer.h" |
26 #include "net/http/http_auth_handler_factory.h" | 26 #include "net/http/http_auth_handler_factory.h" |
27 #include "net/http/http_cache.h" | 27 #include "net/http/http_cache.h" |
28 #include "net/http/http_network_session.h" | 28 #include "net/http/http_network_session.h" |
29 #include "net/proxy/dhcp_proxy_script_fetcher_factory.h" | 29 #include "net/proxy/dhcp_proxy_script_fetcher_factory.h" |
30 #include "net/proxy/proxy_config_service_fixed.h" | 30 #include "net/proxy/proxy_config_service_fixed.h" |
31 #include "net/proxy/proxy_script_fetcher_impl.h" | 31 #include "net/proxy/proxy_script_fetcher_impl.h" |
32 #include "net/proxy/proxy_service.h" | 32 #include "net/proxy/proxy_service.h" |
| 33 #include "net/spdy/spdy_config_service_defaults.h" |
33 #include "net/url_request/url_request.h" | 34 #include "net/url_request/url_request.h" |
34 #include "net/url_request/url_request_context.h" | 35 #include "net/url_request/url_request_context.h" |
35 #include "net/url_request/url_request_context_storage.h" | 36 #include "net/url_request/url_request_context_storage.h" |
36 | 37 |
37 namespace { | 38 namespace { |
38 | 39 |
39 // ExperimentURLRequestContext ------------------------------------------------ | 40 // ExperimentURLRequestContext ------------------------------------------------ |
40 | 41 |
41 // An instance of ExperimentURLRequestContext is created for each experiment | 42 // An instance of ExperimentURLRequestContext is created for each experiment |
42 // run by ConnectionTester. The class initializes network dependencies according | 43 // run by ConnectionTester. The class initializes network dependencies according |
(...skipping 23 matching lines...) Expand all Loading... |
66 if (rv != net::OK) | 67 if (rv != net::OK) |
67 return rv; // Failure. | 68 return rv; // Failure. |
68 storage_.set_proxy_service(proxy_service_tmp.release()); | 69 storage_.set_proxy_service(proxy_service_tmp.release()); |
69 | 70 |
70 // The rest of the dependencies are standard, and don't depend on the | 71 // The rest of the dependencies are standard, and don't depend on the |
71 // experiment being run. | 72 // experiment being run. |
72 storage_.set_cert_verifier(new net::CertVerifier); | 73 storage_.set_cert_verifier(new net::CertVerifier); |
73 storage_.set_dnsrr_resolver(new net::DnsRRResolver); | 74 storage_.set_dnsrr_resolver(new net::DnsRRResolver); |
74 storage_.set_ftp_transaction_factory( | 75 storage_.set_ftp_transaction_factory( |
75 new net::FtpNetworkLayer(host_resolver())); | 76 new net::FtpNetworkLayer(host_resolver())); |
| 77 storage_.set_spdy_config_service(new net::SpdyConfigServiceDefaults); |
76 storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults); | 78 storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults); |
77 storage_.set_http_auth_handler_factory( | 79 storage_.set_http_auth_handler_factory( |
78 net::HttpAuthHandlerFactory::CreateDefault(host_resolver())); | 80 net::HttpAuthHandlerFactory::CreateDefault(host_resolver())); |
79 | 81 |
80 net::HttpNetworkSession::Params session_params; | 82 net::HttpNetworkSession::Params session_params; |
81 session_params.host_resolver = host_resolver(); | 83 session_params.host_resolver = host_resolver(); |
82 session_params.dnsrr_resolver = dnsrr_resolver(); | 84 session_params.dnsrr_resolver = dnsrr_resolver(); |
83 session_params.cert_verifier = cert_verifier(); | 85 session_params.cert_verifier = cert_verifier(); |
84 session_params.proxy_service = proxy_service(); | 86 session_params.proxy_service = proxy_service(); |
85 session_params.http_auth_handler_factory = http_auth_handler_factory(); | 87 session_params.http_auth_handler_factory = http_auth_handler_factory(); |
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
460 | 462 |
461 // Notify the delegate of completion. | 463 // Notify the delegate of completion. |
462 delegate_->OnCompletedConnectionTestExperiment(current, result); | 464 delegate_->OnCompletedConnectionTestExperiment(current, result); |
463 | 465 |
464 if (remaining_experiments_.empty()) { | 466 if (remaining_experiments_.empty()) { |
465 delegate_->OnCompletedConnectionTestSuite(); | 467 delegate_->OnCompletedConnectionTestSuite(); |
466 } else { | 468 } else { |
467 StartNextExperiment(); | 469 StartNextExperiment(); |
468 } | 470 } |
469 } | 471 } |
OLD | NEW |