[SPDY] Enable tests for SPDY/3.1 and SPDY/4

net/spdy/spdy_websocket_stream_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/spdy/spdy_websocket_stream.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 307 matching lines @@
 
 // TODO(toyoshim): Replace old framing data to new one, then use HEADERS and
 // data frames.
 const char SpdyWebSocketStreamTest::kMessageFrame[] = "\x81\x05hello";
 const char SpdyWebSocketStreamTest::kClosingFrame[] = "\x88\0";
 const size_t SpdyWebSocketStreamTest::kMessageFrameLength =
     arraysize(SpdyWebSocketStreamTest::kMessageFrame) - 1;
 const size_t SpdyWebSocketStreamTest::kClosingFrameLength =
     arraysize(SpdyWebSocketStreamTest::kClosingFrame) - 1;
 
-// TODO(akalin): Don't early-exit in the tests below for values >
-// kProtoSPDY3.
-
 TEST_P(SpdyWebSocketStreamTest, Basic) {
-  if (GetParam() > kProtoSPDY3)
-    return;
-
   Prepare(1);
   MockWrite writes[] = {
     CreateMockWrite(*request_frame_.get(), 1),
     CreateMockWrite(*message_frame_.get(), 3),
     CreateMockWrite(*closing_frame_.get(), 5)
   };
 
   MockRead reads[] = {
     CreateMockRead(*response_frame_.get(), 2),
     CreateMockRead(*message_frame_.get(), 4),
@@ skipping 56 matching lines @@
   EXPECT_EQ(OK, events[6].result);
 
   // EOF close SPDY session.
   EXPECT_TRUE(!http_session_->spdy_session_pool()->HasSession(
       spdy_session_key_));
   EXPECT_TRUE(data()->at_read_eof());
   EXPECT_TRUE(data()->at_write_eof());
 }
 
 TEST_P(SpdyWebSocketStreamTest, DestructionBeforeClose) {
-  if (GetParam() > kProtoSPDY3)
-    return;
-
   Prepare(1);
   MockWrite writes[] = {
     CreateMockWrite(*request_frame_.get(), 1),
     CreateMockWrite(*message_frame_.get(), 3)
   };
 
   MockRead reads[] = {
     CreateMockRead(*response_frame_.get(), 2),
     CreateMockRead(*message_frame_.get(), 4),
     MockRead(ASYNC, ERR_IO_PENDING, 5)
@@ skipping 42 matching lines @@
             events[3].event_type);
   EXPECT_EQ(static_cast<int>(kMessageFrameLength), events[3].result);
 
   EXPECT_TRUE(http_session_->spdy_session_pool()->HasSession(
       spdy_session_key_));
   EXPECT_TRUE(data()->at_read_eof());
   EXPECT_TRUE(data()->at_write_eof());
 }
 
 TEST_P(SpdyWebSocketStreamTest, DestructionAfterExplicitClose) {
-  if (GetParam() > kProtoSPDY3)
-    return;
-
   Prepare(1);
   MockWrite writes[] = {
     CreateMockWrite(*request_frame_.get(), 1),
     CreateMockWrite(*message_frame_.get(), 3),
     CreateMockWrite(*closing_frame_.get(), 5)
   };
 
   MockRead reads[] = {
     CreateMockRead(*response_frame_.get(), 2),
     CreateMockRead(*message_frame_.get(), 4),
@@ skipping 41 matching lines @@
   EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_RECEIVED_DATA,
             events[3].event_type);
   EXPECT_EQ(static_cast<int>(kMessageFrameLength), events[3].result);
   EXPECT_EQ(SpdyWebSocketStreamEvent::EVENT_CLOSE, events[4].event_type);
 
   EXPECT_TRUE(http_session_->spdy_session_pool()->HasSession(
       spdy_session_key_));
 }
 
 TEST_P(SpdyWebSocketStreamTest, IOPending) {
-  if (GetParam() > kProtoSPDY3)
-    return;
-
   Prepare(1);
   scoped_ptr<SpdyFrame> settings_frame(
       spdy_util_.ConstructSpdySettings(spdy_settings_to_send_));
   MockWrite writes[] = {
     // Setting throttling make SpdySession send settings frame automatically.
     CreateMockWrite(*settings_frame.get(), 1),
     CreateMockWrite(*request_frame_.get(), 3),
     CreateMockWrite(*message_frame_.get(), 6),
     CreateMockWrite(*closing_frame_.get(), 9)
   };
@@ skipping 83 matching lines @@
   EXPECT_EQ(OK, events[7].result);
 
   // EOF close SPDY session.
   EXPECT_TRUE(!http_session_->spdy_session_pool()->HasSession(
       spdy_session_key_));
   EXPECT_TRUE(data()->at_read_eof());
   EXPECT_TRUE(data()->at_write_eof());
 }
 
 }  // namespace net