Chromium Code Reviews| 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 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 109 new net::FtpNetworkLayer(host_resolver())); | 109 new net::FtpNetworkLayer(host_resolver())); |
| 110 storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults); | 110 storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults); |
| 111 storage_.set_http_auth_handler_factory( | 111 storage_.set_http_auth_handler_factory( |
| 112 net::HttpAuthHandlerFactory::CreateDefault(host_resolver())); | 112 net::HttpAuthHandlerFactory::CreateDefault(host_resolver())); |
| 113 storage_.set_http_server_properties(new net::HttpServerPropertiesImpl); | 113 storage_.set_http_server_properties(new net::HttpServerPropertiesImpl); |
| 114 | 114 |
| 115 net::HttpNetworkSession::Params session_params; | 115 net::HttpNetworkSession::Params session_params; |
| 116 session_params.host_resolver = host_resolver(); | 116 session_params.host_resolver = host_resolver(); |
| 117 session_params.cert_verifier = cert_verifier(); | 117 session_params.cert_verifier = cert_verifier(); |
| 118 session_params.proxy_service = proxy_service(); | 118 session_params.proxy_service = proxy_service(); |
| 119 session_params.ssl_config_service = ssl_config_service(); | |
| 119 session_params.http_auth_handler_factory = http_auth_handler_factory(); | 120 session_params.http_auth_handler_factory = http_auth_handler_factory(); |
| 120 session_params.http_server_properties = http_server_properties(); | 121 session_params.http_server_properties = http_server_properties(); |
|
mmenke
2012/07/26 17:57:15
Seemed like the three items above should be set th
| |
| 121 session_params.ssl_config_service = ssl_config_service(); | 122 session_params.net_log = proxy_request_context_->net_log(); |
| 122 scoped_refptr<net::HttpNetworkSession> network_session( | 123 scoped_refptr<net::HttpNetworkSession> network_session( |
| 123 new net::HttpNetworkSession(session_params)); | 124 new net::HttpNetworkSession(session_params)); |
| 124 storage_.set_http_transaction_factory(new net::HttpCache( | 125 storage_.set_http_transaction_factory(new net::HttpCache( |
| 125 network_session, | 126 network_session, |
| 126 net::HttpCache::DefaultBackend::InMemory(0))); | 127 net::HttpCache::DefaultBackend::InMemory(0))); |
| 127 // In-memory cookie store. | 128 // In-memory cookie store. |
| 128 storage_.set_cookie_store(new net::CookieMonster(NULL, NULL)); | 129 storage_.set_cookie_store(new net::CookieMonster(NULL, NULL)); |
| 129 | 130 |
| 130 return net::OK; | 131 return net::OK; |
| 131 } | 132 } |
| (...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 516 | 517 |
| 517 // Notify the delegate of completion. | 518 // Notify the delegate of completion. |
| 518 delegate_->OnCompletedConnectionTestExperiment(current, result); | 519 delegate_->OnCompletedConnectionTestExperiment(current, result); |
| 519 | 520 |
| 520 if (remaining_experiments_.empty()) { | 521 if (remaining_experiments_.empty()) { |
| 521 delegate_->OnCompletedConnectionTestSuite(); | 522 delegate_->OnCompletedConnectionTestSuite(); |
| 522 } else { | 523 } else { |
| 523 StartNextExperiment(); | 524 StartNextExperiment(); |
| 524 } | 525 } |
| 525 } | 526 } |
| OLD | NEW |