[SPDY] Fix SpdySession's handling of SYN_REPLY frames

net/spdy/spdy_http_stream_unittest.cc

Index: net/spdy/spdy_http_stream_unittest.cc
diff --git a/net/spdy/spdy_http_stream_unittest.cc b/net/spdy/spdy_http_stream_unittest.cc
index 6405b8f1e9deb08fd49524ba1847abd568aa64f1..88b279f0eba2c57c20c4aa875e9d94ce62ac2a85 100644
--- a/net/spdy/spdy_http_stream_unittest.cc
+++ b/net/spdy/spdy_http_stream_unittest.cc
@@ -63,10 +63,10 @@ void TestLoadTimingNotReused(const HttpStream& stream) {
 
 }  // namespace
 
-class SpdyHttpStreamSpdy2Test : public testing::Test,
-                                public testing::WithParamInterface<NextProto> {
+class SpdyHttpStreamTest : public testing::Test,
+                           public testing::WithParamInterface<NextProto> {
  public:
-  SpdyHttpStreamSpdy2Test()
+  SpdyHttpStreamTest()
       : spdy_util_(GetParam()),
         session_deps_(GetParam()) {
     session_deps_.net_log = &net_log_;
@@ -164,7 +164,7 @@ class SpdyHttpStreamSpdy2Test : public testing::Test,
 
 INSTANTIATE_TEST_CASE_P(
     NextProto,
-    SpdyHttpStreamSpdy2Test,
+    SpdyHttpStreamTest,
     testing::Values(kProtoSPDY2, kProtoSPDY3, kProtoSPDY31, kProtoSPDY4a2));
 
 // TODO(akalin): Don't early-exit in the tests below for values >
@@ -172,7 +172,7 @@ INSTANTIATE_TEST_CASE_P(
 
 // SpdyHttpStream::GetUploadProgress() should still work even before the
 // stream is initialized.
-TEST_P(SpdyHttpStreamSpdy2Test, GetUploadProgressBeforeInitialization) {
+TEST_P(SpdyHttpStreamTest, GetUploadProgressBeforeInitialization) {
   if (GetParam() > kProtoSPDY3)
     return;
 
@@ -182,7 +182,7 @@ TEST_P(SpdyHttpStreamSpdy2Test, GetUploadProgressBeforeInitialization) {
   EXPECT_EQ(0u, progress.position());
 }
 
-TEST_P(SpdyHttpStreamSpdy2Test, SendRequest) {
+TEST_P(SpdyHttpStreamTest, SendRequest) {
   if (GetParam() > kProtoSPDY3)
     return;
 
@@ -249,7 +249,7 @@ TEST_P(SpdyHttpStreamSpdy2Test, SendRequest) {
   TestLoadTimingNotReused(*http_stream);
 }
 
-TEST_P(SpdyHttpStreamSpdy2Test, LoadTimingTwoRequests) {
+TEST_P(SpdyHttpStreamTest, LoadTimingTwoRequests) {
   if (GetParam() > kProtoSPDY3)
     return;
 
@@ -350,7 +350,7 @@ TEST_P(SpdyHttpStreamSpdy2Test, LoadTimingTwoRequests) {
   TestLoadTimingReused(*http_stream2);
 }
 
-TEST_P(SpdyHttpStreamSpdy2Test, SendChunkedPost) {
+TEST_P(SpdyHttpStreamTest, SendChunkedPost) {
   BufferedSpdyFramer framer(spdy_util_.spdy_version(), false);
 
   scoped_ptr<SpdyFrame> initial_window_update(
@@ -427,7 +427,7 @@ TEST_P(SpdyHttpStreamSpdy2Test, SendChunkedPost) {
 
 // Test to ensure the SpdyStream state machine does not get confused when a
 // chunk becomes available while a write is pending.
-TEST_P(SpdyHttpStreamSpdy2Test, DelayedSendChunkedPost) {
+TEST_P(SpdyHttpStreamTest, DelayedSendChunkedPost) {
   if (GetParam() > kProtoSPDY3)
     return;
 
@@ -537,7 +537,7 @@ TEST_P(SpdyHttpStreamSpdy2Test, DelayedSendChunkedPost) {
 
 // Test the receipt of a WINDOW_UPDATE frame while waiting for a chunk to be
 // made available is handled correctly.
-TEST_P(SpdyHttpStreamSpdy2Test, DelayedSendChunkedPostWithWindowUpdate) {
+TEST_P(SpdyHttpStreamTest, DelayedSendChunkedPostWithWindowUpdate) {
   if (GetParam() != kProtoSPDY3)
     return;
 
@@ -654,7 +654,7 @@ TEST_P(SpdyHttpStreamSpdy2Test, DelayedSendChunkedPostWithWindowUpdate) {
 }
 
 // Test case for bug: http://code.google.com/p/chromium/issues/detail?id=50058
-TEST_P(SpdyHttpStreamSpdy2Test, SpdyURLTest) {
+TEST_P(SpdyHttpStreamTest, SpdyURLTest) {
   if (GetParam() > kProtoSPDY3)
     return;
 
@@ -772,7 +772,7 @@ SpdyFrame* ConstructCredentialRequestFrame(NextProto next_proto,
 // Test that if we request a resource for a new origin on a session that
 // used domain bound certificates, that we send a CREDENTIAL frame for
 // the new domain before we send the new request.
-void SpdyHttpStreamSpdy2Test::TestSendCredentials(
+void SpdyHttpStreamTest::TestSendCredentials(
     ServerBoundCertService* server_bound_cert_service,
     const std::string& cert,
     const std::string& proof) {
@@ -896,7 +896,7 @@ void SpdyHttpStreamSpdy2Test::TestSendCredentials(
   ASSERT_EQ(200, response.headers->response_code());
 }
 
-TEST_P(SpdyHttpStreamSpdy2Test, SendCredentialsEC) {
+TEST_P(SpdyHttpStreamTest, SendCredentialsEC) {
   if (GetParam() != kProtoSPDY3)
     return;
 
@@ -916,7 +916,7 @@ TEST_P(SpdyHttpStreamSpdy2Test, SendCredentialsEC) {
   sequenced_worker_pool->Shutdown();
 }
 
-TEST_P(SpdyHttpStreamSpdy2Test, DontSendCredentialsForHttpUrlsEC) {
+TEST_P(SpdyHttpStreamTest, DontSendCredentialsForHttpUrlsEC) {
   if (GetParam() != kProtoSPDY3)
     return;