summaryrefslogtreecommitdiffstats
path: root/net/spdy/spdy_framer.h
diff options
context:
space:
mode:
authorrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-01 03:34:07 +0000
committerrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-01 03:34:07 +0000
commitfe2f62adb59d0ca3789312b55646e3d63ba8918f (patch)
treecdaeb552d4ffcb020b71ad1ebe9976b6b75ab175 /net/spdy/spdy_framer.h
parentd926c20f2588d7967a723f7454a0007740db0bc7 (diff)
downloadchromium_src-fe2f62adb59d0ca3789312b55646e3d63ba8918f.zip
chromium_src-fe2f62adb59d0ca3789312b55646e3d63ba8918f.tar.gz
chromium_src-fe2f62adb59d0ca3789312b55646e3d63ba8918f.tar.bz2
Fixes the tests written for http://codereview.chromium.org/3432009/show
to use DeterministicSocketData which should avoid the flaky test problem that 3432009 introduced. -- Add a new class SpdyProxyClientSocket which implements ClientSocket by sending a CONNECT request via a SPDY SYN_STREAM frame to a SPDY proxy, and then reading/writing data to/from SPDY Data frames. BUG=29625 TEST=none Review URL: http://codereview.chromium.org/3578002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61144 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_framer.h')
-rw-r--r--net/spdy/spdy_framer.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/net/spdy/spdy_framer.h b/net/spdy/spdy_framer.h
index e6d0e15..00ddac0 100644
--- a/net/spdy/spdy_framer.h
+++ b/net/spdy/spdy_framer.h
@@ -26,10 +26,11 @@ typedef struct z_stream_s z_stream; // Forward declaration for zlib.
namespace net {
class HttpNetworkLayer;
class HttpNetworkTransactionTest;
+class SpdyHttpStreamTest;
class SpdyNetworkTransactionTest;
+class SpdyProxyClientSocketTest;
class SpdySessionTest;
class SpdyStreamTest;
-class SpdyHttpStreamTest;
}
namespace spdy {
@@ -248,11 +249,12 @@ class SpdyFramer {
protected:
FRIEND_TEST_ALL_PREFIXES(SpdyFramerTest, DataCompression);
FRIEND_TEST_ALL_PREFIXES(SpdyFramerTest, UnclosedStreamDataCompressors);
- friend class net::SpdyNetworkTransactionTest;
- friend class net::HttpNetworkTransactionTest;
friend class net::HttpNetworkLayer; // This is temporary for the server.
- friend class net::SpdySessionTest;
+ friend class net::HttpNetworkTransactionTest;
friend class net::SpdyHttpStreamTest;
+ friend class net::SpdyNetworkTransactionTest;
+ friend class net::SpdyProxyClientSocketTest;
+ friend class net::SpdySessionTest;
friend class net::SpdyStreamTest;
friend class test::TestSpdyVisitor;
friend void test::FramerSetEnableCompressionHelper(SpdyFramer* framer,