[SPDY] Refactor tests in preparation for a fix for a session flow control bug

net/spdy/spdy_stream_spdy2_unittest.cc

Index: net/spdy/spdy_stream_spdy2_unittest.cc
diff --git a/net/spdy/spdy_stream_spdy2_unittest.cc b/net/spdy/spdy_stream_spdy2_unittest.cc
index a27cacc78e99671a8d5042c0a071a8a8acfd430d..4af14c11128d46f439d219e9a96f9bc4e8327b2e 100644
--- a/net/spdy/spdy_stream_spdy2_unittest.cc
+++ b/net/spdy/spdy_stream_spdy2_unittest.cc
@@ -40,31 +40,11 @@ const SpdyHeaderInfo kSynStartHeader = {
   DATA_FLAG_NONE
 };
 
-const char* const kGetHeaders[] = {
-  "method",
-  "GET",
-  "scheme",
-  "http",
-  "host",
-  "www.google.com",
-  "url",
-  "/",
-  "version",
-  "HTTP/1.1",
-};
-
-scoped_ptr<SpdyFrame> ConstructSpdyGetRequest() {
+// TODO(akalin): Merge with ConstructSpdyGet(). (The sticking point is
+// CONTROL_FLAG_NONE vs. CONTROL_FLAG_FIN.)
+scoped_ptr<SpdyFrame> ConstructSpdyGetRequest(const char* url) {
   return scoped_ptr<SpdyFrame>(
-      ConstructSpdyPacket(
-          kSynStartHeader, NULL, 0, kGetHeaders, arraysize(kGetHeaders) / 2));
-}
-
-scoped_ptr<SpdyHeaderBlock> ConstructSpdyGetHeaderBlock() {
-  scoped_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock);
-  for (size_t i = 0; i < arraysize(kGetHeaders) / 2; ++i) {
-    (*headers)[kGetHeaders[2*i]] = kGetHeaders[2*i+1];
-  }
-  return headers.Pass();
+      ConstructSpdyPacket(kSynStartHeader, ConstructHeaderBlock(url)));
 }
 
 scoped_ptr<SpdyFrame> ConstructSpdyBodyFrame(const char* data, int length) {
@@ -110,9 +90,12 @@ class SpdyStreamSpdy2Test : public testing::Test {
 };
 
 TEST_F(SpdyStreamSpdy2Test, SendDataAfterOpen) {
+  const char kStreamUrl[] = "http://www.google.com/";
+  GURL url(kStreamUrl);
+
   session_ = SpdySessionDependencies::SpdyCreateSession(&session_deps_);
 
-  scoped_ptr<SpdyFrame> req = ConstructSpdyGetRequest();
+  scoped_ptr<SpdyFrame> req = ConstructSpdyGetRequest(kStreamUrl);
   scoped_ptr<SpdyFrame> msg = ConstructSpdyBodyFrame("\0hello!\xff", 8);
   MockWrite writes[] = {
     CreateMockWrite(*req),
@@ -141,8 +124,6 @@ TEST_F(SpdyStreamSpdy2Test, SendDataAfterOpen) {
   session_deps_.socket_factory->AddSocketDataProvider(&data);
 
   scoped_refptr<SpdySession> session(CreateSpdySession());
-  const char kStreamUrl[] = "http://www.google.com/";
-  GURL url(kStreamUrl);
 
   InitializeSpdySession(session, host_port_pair_);
 
@@ -158,7 +139,7 @@ TEST_F(SpdyStreamSpdy2Test, SendDataAfterOpen) {
 
   EXPECT_FALSE(stream->HasUrl());
 
-  stream->set_spdy_headers(ConstructSpdyGetHeaderBlock());
+  stream->set_spdy_headers(ConstructHeaderBlock(kStreamUrl));
   EXPECT_TRUE(stream->HasUrl());
   EXPECT_EQ(kStreamUrl, stream->GetUrl().spec());
 
@@ -298,9 +279,12 @@ TEST_F(SpdyStreamSpdy2Test, PushedStream) {
 }
 
 TEST_F(SpdyStreamSpdy2Test, StreamError) {
+  const char kStreamUrl[] = "http://www.google.com/";
+  GURL url(kStreamUrl);
+
   session_ = SpdySessionDependencies::SpdyCreateSession(&session_deps_);
 
-  scoped_ptr<SpdyFrame> req = ConstructSpdyGetRequest();
+  scoped_ptr<SpdyFrame> req = ConstructSpdyGetRequest(kStreamUrl);
   scoped_ptr<SpdyFrame> msg(
       ConstructSpdyBodyFrame("\0hello!\xff", 8));
   MockWrite writes[] = {
@@ -332,8 +316,6 @@ TEST_F(SpdyStreamSpdy2Test, StreamError) {
   session_deps_.socket_factory->AddSocketDataProvider(&data);
 
   scoped_refptr<SpdySession> session(CreateSpdySession());
-  const char kStreamUrl[] = "http://www.google.com/";
-  GURL url(kStreamUrl);
 
   InitializeSpdySession(session, host_port_pair_);
 
@@ -349,7 +331,7 @@ TEST_F(SpdyStreamSpdy2Test, StreamError) {
 
   EXPECT_FALSE(stream->HasUrl());
 
-  stream->set_spdy_headers(ConstructSpdyGetHeaderBlock());
+  stream->set_spdy_headers(ConstructHeaderBlock(kStreamUrl));
   EXPECT_TRUE(stream->HasUrl());
   EXPECT_EQ(kStreamUrl, stream->GetUrl().spec());