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

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

Issue 8692012: net: replace DnsRRResoler with TransportSecurityState in plumbing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ... Created 9 years 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 | « chrome/browser/io_thread.cc ('k') | chrome/browser/net/connection_tester_unittest.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) 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/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"
11 #include "base/message_loop.h" 11 #include "base/message_loop.h"
12 #include "base/task.h" 12 #include "base/task.h"
13 #include "base/threading/thread_restrictions.h" 13 #include "base/threading/thread_restrictions.h"
14 #include "base/utf_string_conversions.h" 14 #include "base/utf_string_conversions.h"
15 #include "chrome/browser/importer/firefox_proxy_settings.h" 15 #include "chrome/browser/importer/firefox_proxy_settings.h"
16 #include "chrome/common/chrome_switches.h" 16 #include "chrome/common/chrome_switches.h"
17 #include "net/base/cert_verifier.h" 17 #include "net/base/cert_verifier.h"
18 #include "net/base/cookie_monster.h" 18 #include "net/base/cookie_monster.h"
19 #include "net/base/dnsrr_resolver.h"
20 #include "net/base/host_resolver.h" 19 #include "net/base/host_resolver.h"
21 #include "net/base/host_resolver_impl.h" 20 #include "net/base/host_resolver_impl.h"
22 #include "net/base/io_buffer.h" 21 #include "net/base/io_buffer.h"
23 #include "net/base/net_errors.h" 22 #include "net/base/net_errors.h"
24 #include "net/base/net_util.h" 23 #include "net/base/net_util.h"
25 #include "net/base/ssl_config_service_defaults.h" 24 #include "net/base/ssl_config_service_defaults.h"
26 #include "net/ftp/ftp_network_layer.h" 25 #include "net/ftp/ftp_network_layer.h"
27 #include "net/http/http_auth_handler_factory.h" 26 #include "net/http/http_auth_handler_factory.h"
28 #include "net/http/http_cache.h" 27 #include "net/http/http_cache.h"
29 #include "net/http/http_network_session.h" 28 #include "net/http/http_network_session.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 scoped_ptr<net::ProxyService> proxy_service_tmp; 64 scoped_ptr<net::ProxyService> proxy_service_tmp;
66 rv = CreateProxyService(experiment.proxy_settings_experiment, 65 rv = CreateProxyService(experiment.proxy_settings_experiment,
67 &proxy_service_tmp); 66 &proxy_service_tmp);
68 if (rv != net::OK) 67 if (rv != net::OK)
69 return rv; // Failure. 68 return rv; // Failure.
70 storage_.set_proxy_service(proxy_service_tmp.release()); 69 storage_.set_proxy_service(proxy_service_tmp.release());
71 70
72 // 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
73 // experiment being run. 72 // experiment being run.
74 storage_.set_cert_verifier(new net::CertVerifier); 73 storage_.set_cert_verifier(new net::CertVerifier);
75 storage_.set_dnsrr_resolver(new net::DnsRRResolver);
76 storage_.set_ftp_transaction_factory( 74 storage_.set_ftp_transaction_factory(
77 new net::FtpNetworkLayer(host_resolver())); 75 new net::FtpNetworkLayer(host_resolver()));
78 storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults); 76 storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults);
79 storage_.set_http_auth_handler_factory( 77 storage_.set_http_auth_handler_factory(
80 net::HttpAuthHandlerFactory::CreateDefault(host_resolver())); 78 net::HttpAuthHandlerFactory::CreateDefault(host_resolver()));
81 storage_.set_http_server_properties(new net::HttpServerPropertiesImpl); 79 storage_.set_http_server_properties(new net::HttpServerPropertiesImpl);
82 80
83 net::HttpNetworkSession::Params session_params; 81 net::HttpNetworkSession::Params session_params;
84 session_params.host_resolver = host_resolver(); 82 session_params.host_resolver = host_resolver();
85 session_params.dnsrr_resolver = dnsrr_resolver();
86 session_params.cert_verifier = cert_verifier(); 83 session_params.cert_verifier = cert_verifier();
87 session_params.proxy_service = proxy_service(); 84 session_params.proxy_service = proxy_service();
88 session_params.http_auth_handler_factory = http_auth_handler_factory(); 85 session_params.http_auth_handler_factory = http_auth_handler_factory();
89 session_params.http_server_properties = http_server_properties(); 86 session_params.http_server_properties = http_server_properties();
90 session_params.ssl_config_service = ssl_config_service(); 87 session_params.ssl_config_service = ssl_config_service();
91 scoped_refptr<net::HttpNetworkSession> network_session( 88 scoped_refptr<net::HttpNetworkSession> network_session(
92 new net::HttpNetworkSession(session_params)); 89 new net::HttpNetworkSession(session_params));
93 storage_.set_http_transaction_factory(new net::HttpCache( 90 storage_.set_http_transaction_factory(new net::HttpCache(
94 network_session, 91 network_session,
95 net::HttpCache::DefaultBackend::InMemory(0))); 92 net::HttpCache::DefaultBackend::InMemory(0)));
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 461
465 // Notify the delegate of completion. 462 // Notify the delegate of completion.
466 delegate_->OnCompletedConnectionTestExperiment(current, result); 463 delegate_->OnCompletedConnectionTestExperiment(current, result);
467 464
468 if (remaining_experiments_.empty()) { 465 if (remaining_experiments_.empty()) {
469 delegate_->OnCompletedConnectionTestSuite(); 466 delegate_->OnCompletedConnectionTestSuite();
470 } else { 467 } else {
471 StartNextExperiment(); 468 StartNextExperiment();
472 } 469 }
473 } 470 }
OLDNEW
« no previous file with comments | « chrome/browser/io_thread.cc ('k') | chrome/browser/net/connection_tester_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698