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

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: Done Created 8 years, 1 month 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 c54325cf3a180742dd7e8e2dc3786c6955840006..7bfce4e7f524e83f22940b252e66646e08495d31 100644
--- a/net/http/http_network_session.cc
+++ b/net/http/http_network_session.cc
@@ -8,6 +8,7 @@
#include "base/compiler_specific.h"
#include "base/logging.h"
+#include "base/rand_util.h"
#include "base/stl_util.h"
#include "base/string_util.h"
#include "base/values.h"
@@ -16,6 +17,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/spdy/spdy_session_pool.h"
@@ -83,6 +86,10 @@ HttpNetworkSession::HttpNetworkSession(const Params& params)
params.ssl_config_service,
params.http_server_properties,
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