[SPDY] Incorporate latest framing changes from HTTP2 into SPDY 4 as SPDY 4a2.

net/spdy/spdy_session_spdy3_unittest.cc

 // Copyright (c) 2012 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_session.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
@@ skipping 2391 matching lines @@
   EXPECT_EQ(0, session->session_unacked_recv_window_bytes_);
 }
 
 // Within this framework and with the "enable_spdy_4" flag, a
 // SpdySession should be initialized with flow control enabled for
 // streams and sessions and with protocol version 4.
 //
 // NOTE(akalin): We are still figuring out the story for SPDY4 test
 // coverage.
 TEST_F(SpdySessionSpdy3Test, ProtocolNegotiation4) {
-  session_deps_.protocol = kProtoSPDY4a1;
+  session_deps_.protocol = kProtoSPDY4a2;
   session_deps_.host_resolver->set_synchronous_mode(true);
 
   MockConnect connect_data(SYNCHRONOUS, OK);
   MockRead reads[] = {
     MockRead(SYNCHRONOUS, 0, 0)  // EOF
   };
   StaticSocketDataProvider data(reads, arraysize(reads), NULL, 0);
   data.set_connect_data(connect_data);
   session_deps_.socket_factory->AddSocketDataProvider(&data);
 
@@ skipping 1305 matching lines @@
   // Cancelling the request should still not release the session's socket,
   // since the session is still kept alive by the SpdySessionPool.
   ASSERT_TRUE(spdy_stream1.get());
   spdy_stream1->Cancel();
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(pool->IsStalled());
   EXPECT_FALSE(callback2.have_result());
 }
 
 }  // namespace net