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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
77 storage_.set_http_auth_handler_factory( | 77 storage_.set_http_auth_handler_factory( |
78 net::HttpAuthHandlerFactory::CreateDefault(host_resolver())); | 78 net::HttpAuthHandlerFactory::CreateDefault(host_resolver())); |
79 | 79 |
80 net::HttpNetworkSession::Params session_params; | 80 net::HttpNetworkSession::Params session_params; |
81 session_params.host_resolver = host_resolver(); | 81 session_params.host_resolver = host_resolver(); |
82 session_params.dnsrr_resolver = dnsrr_resolver(); | 82 session_params.dnsrr_resolver = dnsrr_resolver(); |
83 session_params.cert_verifier = cert_verifier(); | 83 session_params.cert_verifier = cert_verifier(); |
84 session_params.proxy_service = proxy_service(); | 84 session_params.proxy_service = proxy_service(); |
85 session_params.http_auth_handler_factory = http_auth_handler_factory(); | 85 session_params.http_auth_handler_factory = http_auth_handler_factory(); |
86 session_params.ssl_config_service = ssl_config_service(); | 86 session_params.ssl_config_service = ssl_config_service(); |
87 session_params.http_server_properties = NULL; | |
willchan no longer on Chromium
2011/10/06 22:13:22
This should not be necessary, it should be NULL by
ramant (doing other things)
2011/10/07 01:40:20
Done.
| |
87 scoped_refptr<net::HttpNetworkSession> network_session( | 88 scoped_refptr<net::HttpNetworkSession> network_session( |
88 new net::HttpNetworkSession(session_params)); | 89 new net::HttpNetworkSession(session_params)); |
89 storage_.set_http_transaction_factory(new net::HttpCache( | 90 storage_.set_http_transaction_factory(new net::HttpCache( |
90 network_session, | 91 network_session, |
91 net::HttpCache::DefaultBackend::InMemory(0))); | 92 net::HttpCache::DefaultBackend::InMemory(0))); |
92 // In-memory cookie store. | 93 // In-memory cookie store. |
93 storage_.set_cookie_store(new net::CookieMonster(NULL, NULL)); | 94 storage_.set_cookie_store(new net::CookieMonster(NULL, NULL)); |
94 | 95 |
95 return net::OK; | 96 return net::OK; |
96 } | 97 } |
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
460 | 461 |
461 // Notify the delegate of completion. | 462 // Notify the delegate of completion. |
462 delegate_->OnCompletedConnectionTestExperiment(current, result); | 463 delegate_->OnCompletedConnectionTestExperiment(current, result); |
463 | 464 |
464 if (remaining_experiments_.empty()) { | 465 if (remaining_experiments_.empty()) { |
465 delegate_->OnCompletedConnectionTestSuite(); | 466 delegate_->OnCompletedConnectionTestSuite(); |
466 } else { | 467 } else { |
467 StartNextExperiment(); | 468 StartNextExperiment(); |
468 } | 469 } |
469 } | 470 } |
OLD | NEW |