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

Unified Diff: chrome/browser/net/connection_tester_unittest.cc

Issue 6402002: Simplify HttpCache/HttpNetworkLayer/HttpNetworkSession interaction. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nits. Created 9 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/net/connection_tester.cc ('k') | chrome/browser/policy/device_management_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/net/connection_tester_unittest.cc
diff --git a/chrome/browser/net/connection_tester_unittest.cc b/chrome/browser/net/connection_tester_unittest.cc
index 8eecd81c1f93ec511804397af52dfd899d7012fd..f08daf43ea55b4b2ca96ff53a3561fb69c99a22d 100644
--- a/chrome/browser/net/connection_tester_unittest.cc
+++ b/chrome/browser/net/connection_tester_unittest.cc
@@ -14,6 +14,7 @@
#include "net/ftp/ftp_network_layer.h"
#include "net/http/http_auth_handler_factory.h"
#include "net/http/http_network_layer.h"
+#include "net/http/http_network_session.h"
#include "net/proxy/proxy_config_service_fixed.h"
#include "net/socket/client_socket_factory.h"
#include "net/spdy/spdy_session_pool.h"
@@ -117,20 +118,22 @@ class ConnectionTesterTest : public PlatformTest {
proxy_service_ = net::ProxyService::CreateDirect();
proxy_script_fetcher_context_->set_proxy_service(proxy_service_);
ssl_config_service_ = net::SSLConfigService::CreateSystemSSLConfigService();
- http_transaction_factory_.reset(
- new net::HttpNetworkLayer(
- client_socket_factory_,
+ scoped_refptr<net::HttpNetworkSession> network_session(
+ new net::HttpNetworkSession(
&host_resolver_,
&cert_verifier_,
&dnsrr_resolver_,
- NULL /* DNS cert provenance checker */,
+ NULL /* dns_cert_checker */,
NULL /* ssl_host_info_factory */,
proxy_service_.get(),
+ client_socket_factory_,
ssl_config_service_,
new net::SpdySessionPool(ssl_config_service_),
&http_auth_handler_factory_,
- NULL /* NetworkDelegate */,
- NULL /* NetLog */));
+ NULL /* network_delegate */,
+ NULL /* net_log */));
+ http_transaction_factory_.reset(
+ new net::HttpNetworkLayer(network_session));
proxy_script_fetcher_context_->set_http_transaction_factory(
http_transaction_factory_.get());
// In-memory cookie store.
« no previous file with comments | « chrome/browser/net/connection_tester.cc ('k') | chrome/browser/policy/device_management_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698