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

Unified Diff: net/http/http_network_session.cc

Issue 11416058: Integrating the QuicStreamFactory into the network stack. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 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 side-by-side diff with in-line comments
Download patch
Index: net/http/http_network_session.cc
diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
index 50a18c21aa35c63ae23d7d41b4319c843e557b17..1ad12be5cddb3eb3c35d39ecf5fc7e52fd35181a 100644
--- a/net/http/http_network_session.cc
+++ b/net/http/http_network_session.cc
@@ -9,6 +9,7 @@
#include "base/compiler_specific.h"
#include "base/debug/stack_trace.h"
#include "base/logging.h"
+#include "base/rand_util.h"
#include "base/stl_util.h"
#include "base/string_util.h"
#include "base/values.h"
@@ -17,6 +18,8 @@
#include "net/http/http_stream_factory_impl.h"
#include "net/http/url_security_manager.h"
#include "net/proxy/proxy_service.h"
+#include "net/quic/quic_clock.h"
+#include "net/quic/quic_stream_factory.h"
#include "net/socket/client_socket_factory.h"
#include "net/socket/client_socket_pool_manager_impl.h"
#include "net/socket/next_proto.h"
@@ -108,6 +111,10 @@ HttpNetworkSession::HttpNetworkSession(const Params& params)
params.spdy_max_concurrent_streams_limit,
params.time_func,
params.trusted_spdy_proxy),
+ quic_stream_factory_(params.host_resolver,
+ net::ClientSocketFactory::GetDefaultFactory(),
+ base::Bind(&base::RandUint64),
+ new QuicClock()),
ALLOW_THIS_IN_INITIALIZER_LIST(http_stream_factory_(
new HttpStreamFactoryImpl(this))),
params_(params) {

Powered by Google App Engine
This is Rietveld 408576698