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

net/spdy/spdy_test_util_spdy3.h

Index: net/spdy/spdy_test_util_spdy3.h
diff --git a/net/spdy/spdy_test_util_spdy3.h b/net/spdy/spdy_test_util_spdy3.h
index dfdf6af0aa827050385580e49540fb6325cece2f..aa87a6fbb97357c776adc1c9277052c0c9d64d03 100644
--- a/net/spdy/spdy_test_util_spdy3.h
+++ b/net/spdy/spdy_test_util_spdy3.h
@@ -7,6 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/string_piece.h"
 #include "crypto/ec_private_key.h"
 #include "crypto/ec_signature_creator.h"
 #include "net/base/cert_verifier.h"
@@ -115,9 +116,12 @@ MockRead* ChopReadFrame(const SpdyFrame& frame, int num_chunks);
 // where the even entries are the header names, and the odd entries are the
 // header values.
 // |headers| gets filled in from |extra_headers|.
-void AppendHeadersToSpdyFrame(const char* const extra_headers[],
-                              int extra_header_count,
-                              SpdyHeaderBlock* headers);
+void AppendHeadersToBlock(const char* const extra_headers[],
+                          int extra_header_count,
+                          SpdyHeaderBlock* headers);
+
+// Constructs a HeaderBlock for the given URL.
+scoped_ptr<SpdyHeaderBlock> ConstructHeaderBlock(base::StringPiece url);
 
 // Writes |str| of the given |len| to the buffer pointed to by |buffer_handle|.
 // Uses a template so buffer_handle can be a char* or an unsigned char*.
@@ -150,12 +154,13 @@ int AppendToBuffer(int val,
                    int* buffer_len_remaining);
 
 // Construct a SPDY packet.
-// |head| is the start of the packet, up to but not including
-// the header value pairs.
+SpdyFrame* ConstructSpdyPacket(const SpdyHeaderInfo& header_info,
+                               scoped_ptr<SpdyHeaderBlock> headers);
+
+// Construct a SPDY packet.
 // |extra_headers| are the extra header-value pairs, which typically
 // will vary the most between calls.
 // |tail| is any (relatively constant) header-value pairs to add.
-// |buffer| is the buffer we're filling in.
 // Returns a SpdyFrame.
 SpdyFrame* ConstructSpdyPacket(const SpdyHeaderInfo& header_info,
                                const char* const extra_headers[],