summaryrefslogtreecommitdiffstats
path: root/net/websockets
diff options
context:
space:
mode:
authorrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-22 03:40:38 +0000
committerrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-22 03:40:38 +0000
commitdca629cedc3ed6b52909e6a9e4e02242a08e45c7 (patch)
tree30558ddfb3394b9d244dc44217fe3d1f3f50d211 /net/websockets
parentb1c37fc29acdd561962de77b868dafe1f9a804ee (diff)
downloadchromium_src-dca629cedc3ed6b52909e6a9e4e02242a08e45c7.zip
chromium_src-dca629cedc3ed6b52909e6a9e4e02242a08e45c7.tar.gz
chromium_src-dca629cedc3ed6b52909e6a9e4e02242a08e45c7.tar.bz2
Created a new class SpdyTestStateHelper to serve as a helper to manage the state of a number of SPDY global variables.
Review URL: http://codereview.chromium.org/9817014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128163 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/websockets')
-rw-r--r--net/websockets/websocket_job_spdy2_unittest.cc4
-rw-r--r--net/websockets/websocket_job_spdy3_unittest.cc4
2 files changed, 6 insertions, 2 deletions
diff --git a/net/websockets/websocket_job_spdy2_unittest.cc b/net/websockets/websocket_job_spdy2_unittest.cc
index 2053fcf..da47d43 100644
--- a/net/websockets/websocket_job_spdy2_unittest.cc
+++ b/net/websockets/websocket_job_spdy2_unittest.cc
@@ -319,7 +319,6 @@ namespace net {
class WebSocketJobSpdy2Test : public PlatformTest {
public:
virtual void SetUp() {
- spdy::SpdyFramer::set_enable_compression_default(false);
SpdySession::set_default_protocol(SSLClientSocket::kProtoSPDY2);
stream_type_ = STREAM_INVALID;
cookie_store_ = new MockCookieStore;
@@ -475,6 +474,9 @@ class WebSocketJobSpdy2Test : public PlatformTest {
static const size_t kHandshakeResponseWithCookieLength;
static const size_t kDataHelloLength;
static const size_t kDataWorldLength;
+
+ private:
+ SpdyTestStateHelper spdy_state_;
};
const char WebSocketJobSpdy2Test::kHandshakeRequestWithoutCookie[] =
diff --git a/net/websockets/websocket_job_spdy3_unittest.cc b/net/websockets/websocket_job_spdy3_unittest.cc
index 7dd462d..7f7491c 100644
--- a/net/websockets/websocket_job_spdy3_unittest.cc
+++ b/net/websockets/websocket_job_spdy3_unittest.cc
@@ -319,7 +319,6 @@ namespace net {
class WebSocketJobSpdy3Test : public PlatformTest {
public:
virtual void SetUp() {
- spdy::SpdyFramer::set_enable_compression_default(false);
SpdySession::set_default_protocol(SSLClientSocket::kProtoSPDY3);
stream_type_ = STREAM_INVALID;
cookie_store_ = new MockCookieStore;
@@ -475,6 +474,9 @@ class WebSocketJobSpdy3Test : public PlatformTest {
static const size_t kHandshakeResponseWithCookieLength;
static const size_t kDataHelloLength;
static const size_t kDataWorldLength;
+
+ private:
+ SpdyTestStateHelper spdy_state_;
};
const char WebSocketJobSpdy3Test::kHandshakeRequestWithoutCookie[] =