net/socket/ssl_client_socket_pool_unittest.cc - Issue 9582034: Fork SPDY/2 and SPDY/3 versions of our SPDY tests, in preparation for landing

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/socket/ssl_client_socket_pool_unittest.cc

Issue 9582034: Fork SPDY/2 and SPDY/3 versions of our SPDY tests, in preparation for landing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Fix merge bug Created 8 years, 10 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/socket/ssl_client_socket_pool_unittest.cc

===================================================================

--- net/socket/ssl_client_socket_pool_unittest.cc (revision 124866)

+++ net/socket/ssl_client_socket_pool_unittest.cc (working copy)

@@ -28,9 +28,11 @@

#include "net/socket/socket_test_util.h"

#include "net/spdy/spdy_session.h"

#include "net/spdy/spdy_session_pool.h"

-#include "net/spdy/spdy_test_util.h"

+#include "net/spdy/spdy_test_util_spdy2.h"

#include "testing/gtest/include/gtest/gtest.h"

+using namespace net::test_spdy2;

namespace net {

namespace {

« no previous file with comments | « net/net.gyp ('k') | net/socket_stream/socket_stream_job.h » ('j') | no next file with comments »