Merge the HttpNetworkTransaction tests and parametrize them on a NextProto

net/spdy/spdy_test_util_common.h

Index: net/spdy/spdy_test_util_common.h
diff --git a/net/spdy/spdy_test_util_common.h b/net/spdy/spdy_test_util_common.h
index 5595d9cbb92cdeb266cb50d2d78308f6d788ef54..0a685d072477ef342f259c90f4eef41d79ea6b14 100644
--- a/net/spdy/spdy_test_util_common.h
+++ b/net/spdy/spdy_test_util_common.h
@@ -257,6 +257,8 @@ class SpdyTestUtil {
 
   scoped_ptr<SpdyHeaderBlock> ConstructGetHeaderBlock(
       base::StringPiece url) const;
+  scoped_ptr<SpdyHeaderBlock> ConstructGetHeaderBlockForProxy(
+      base::StringPiece url) const;
   scoped_ptr<SpdyHeaderBlock> ConstructPostHeaderBlock(
       base::StringPiece url,
       int64 content_length) const;
@@ -352,6 +354,11 @@ class SpdyTestUtil {
                               SpdyStreamId stream_id,
                               RequestPriority request_priority) const;
 
+  SpdyFrame* ConstructSpdyGetForProxy(const char* const url,
+                                      bool compressed,
+                                      SpdyStreamId stream_id,
+                                      RequestPriority request_priority) const;
+
   // Constructs a standard SPDY GET SYN frame, optionally compressed.
   // |extra_headers| are the extra header-value pairs, which typically
   // will vary the most between calls.  If |direct| is false, the