net/http/http_network_session.cc - Issue 11416058: Integrating the QuicStreamFactory into the network stack.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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:

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..67dfd4839f6ec4320b160dc496c8b30f30dc37a8 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"

@@ -93,6 +96,10 @@ HttpNetworkSession::HttpNetworkSession(const Params& params)

CreateSocketPoolManager(NORMAL_SOCKET_POOL, params)),

websocket_socket_pool_manager_(

CreateSocketPoolManager(WEBSOCKET_SOCKET_POOL, params)),

+ quic_stream_factory_(params.host_resolver,

+ net::ClientSocketFactory::GetDefaultFactory(),

+ base::Bind(&base::RandUint64),

+ new QuicClock()),

spdy_session_pool_(params.host_resolver,

params.ssl_config_service,

params.http_server_properties,