Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(186)

Side by Side Diff: chrome/browser/net/connection_tester.cc

Issue 3846005: Revert 62918 - net: clean up SSLHostInfo construction.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/service/net/service_url_request_context.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 58
59 // The rest of the dependencies are standard, and don't depend on the 59 // The rest of the dependencies are standard, and don't depend on the
60 // experiment being run. 60 // experiment being run.
61 dnsrr_resolver_ = new net::DnsRRResolver; 61 dnsrr_resolver_ = new net::DnsRRResolver;
62 ftp_transaction_factory_ = new net::FtpNetworkLayer(host_resolver_); 62 ftp_transaction_factory_ = new net::FtpNetworkLayer(host_resolver_);
63 ssl_config_service_ = new net::SSLConfigServiceDefaults; 63 ssl_config_service_ = new net::SSLConfigServiceDefaults;
64 http_auth_handler_factory_ = net::HttpAuthHandlerFactory::CreateDefault( 64 http_auth_handler_factory_ = net::HttpAuthHandlerFactory::CreateDefault(
65 host_resolver_); 65 host_resolver_);
66 http_transaction_factory_ = new net::HttpCache( 66 http_transaction_factory_ = new net::HttpCache(
67 net::HttpNetworkLayer::CreateFactory(host_resolver_, dnsrr_resolver_, 67 net::HttpNetworkLayer::CreateFactory(host_resolver_, dnsrr_resolver_,
68 NULL /* ssl_host_info_factory */, proxy_service_, 68 proxy_service_, ssl_config_service_, http_auth_handler_factory_,
69 ssl_config_service_, http_auth_handler_factory_, NULL, NULL), 69 NULL, NULL),
70 net::HttpCache::DefaultBackend::InMemory(0)); 70 net::HttpCache::DefaultBackend::InMemory(0));
71 // In-memory cookie store. 71 // In-memory cookie store.
72 cookie_store_ = new net::CookieMonster(NULL, NULL); 72 cookie_store_ = new net::CookieMonster(NULL, NULL);
73 73
74 return net::OK; 74 return net::OK;
75 } 75 }
76 76
77 protected: 77 protected:
78 virtual ~ExperimentURLRequestContext() { 78 virtual ~ExperimentURLRequestContext() {
79 delete ftp_transaction_factory_; 79 delete ftp_transaction_factory_;
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 410
411 // Notify the delegate of completion. 411 // Notify the delegate of completion.
412 delegate_->OnCompletedConnectionTestExperiment(current, result); 412 delegate_->OnCompletedConnectionTestExperiment(current, result);
413 413
414 if (remaining_experiments_.empty()) { 414 if (remaining_experiments_.empty()) {
415 delegate_->OnCompletedConnectionTestSuite(); 415 delegate_->OnCompletedConnectionTestSuite();
416 } else { 416 } else {
417 StartNextExperiment(); 417 StartNextExperiment();
418 } 418 }
419 } 419 }
OLDNEW
« no previous file with comments | « no previous file | chrome/service/net/service_url_request_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698