summaryrefslogtreecommitdiffstats
path: root/net/spdy
diff options
context:
space:
mode:
Diffstat (limited to 'net/spdy')
-rw-r--r--net/spdy/spdy_session.h2
-rw-r--r--net/spdy/spdy_session_unittest.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h
index cff7b82..b10f645 100644
--- a/net/spdy/spdy_session.h
+++ b/net/spdy/spdy_session.h
@@ -91,7 +91,7 @@ class SpdySession : public base::RefCounted<SpdySession>,
private:
friend class base::RefCounted<SpdySession>;
- FRIEND_TEST(SpdySessionTest, GetPushStream);
+ FRIEND_TEST(SpdySessionTest, DISABLED_GetPushStream);
enum State {
IDLE,
diff --git a/net/spdy/spdy_session_unittest.cc b/net/spdy/spdy_session_unittest.cc
index feae372..603c269 100644
--- a/net/spdy/spdy_session_unittest.cc
+++ b/net/spdy/spdy_session_unittest.cc
@@ -172,7 +172,7 @@ static const uint8 kPush[] = {
} // namespace
-TEST_F(SpdySessionTest, GetPushStream) {
+TEST_F(SpdySessionTest, DISABLED_GetPushStream) {
SpdySessionTest::TurnOffCompression();
SessionDependencies session_deps;