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

Unified Diff: net/spdy/spdy_test_util.cc

Issue 6402002: Simplify HttpCache/HttpNetworkLayer/HttpNetworkSession interaction. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix CF tests. 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
Index: net/spdy/spdy_test_util.cc
diff --git a/net/spdy/spdy_test_util.cc b/net/spdy/spdy_test_util.cc
index 07a59807dc766aba0bbe97e8438799bed9d0fe2a..760c29fe5db5ad4bbead4f3289cdb2fb278d7726 100644
--- a/net/spdy/spdy_test_util.cc
+++ b/net/spdy/spdy_test_util.cc
@@ -10,6 +10,7 @@
#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "net/http/http_network_transaction.h"
+#include "net/http/http_network_session.h"
wtc 2011/01/28 01:51:23 Nit: list this header before "net/http/http_networ
#include "net/spdy/spdy_framer.h"
namespace net {
@@ -924,20 +925,22 @@ SpdyURLRequestContext::SpdyURLRequestContext() {
ssl_config_service_ = new SSLConfigServiceDefaults;
http_auth_handler_factory_ = HttpAuthHandlerFactory::CreateDefault(
host_resolver_);
+ scoped_refptr<HttpNetworkSession> network_session(
+ new HttpNetworkSession(
+ host_resolver_,
+ cert_verifier_,
+ NULL /* dnsrr_resolver */,
+ NULL /* dns_cert_checker */,
+ NULL /* ssl_host_info_factory */,
+ proxy_service_,
+ &socket_factory_,
+ ssl_config_service_,
+ new SpdySessionPool(NULL),
+ http_auth_handler_factory_,
+ network_delegate_,
+ NULL));
wtc 2011/01/28 01:51:23 Nit: add a /* net_log */ comment after this NULL?
http_transaction_factory_ = new HttpCache(
- new HttpNetworkLayer(&socket_factory_,
- host_resolver_,
- cert_verifier_,
- NULL /* dnsrr_resolver */,
- NULL /* dns_cert_checker */,
- NULL /* ssl_host_info_factory */,
- proxy_service_,
- ssl_config_service_,
- new SpdySessionPool(NULL),
- http_auth_handler_factory_,
- network_delegate_,
- NULL),
- NULL /* net_log */,
+ network_session,
HttpCache::DefaultBackend::InMemory(0));
}

Powered by Google App Engine
This is Rietveld 408576698