[SPDY] Enable tests for SPDY/3.1 and SPDY/4

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 8aacf576c66089e15a11315e9211e2911ce97fed..50baff761ed4f132e72c339852a04796bc303e1a 100644
--- a/net/spdy/spdy_test_util_common.h
+++ b/net/spdy/spdy_test_util_common.h
@@ -5,6 +5,9 @@
 #ifndef NET_SPDY_SPDY_TEST_UTIL_COMMON_H_
 #define NET_SPDY_SPDY_TEST_UTIL_COMMON_H_
 
+#include <string>
+#include <vector>
+
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "crypto/ec_private_key.h"
@@ -43,6 +46,10 @@ const char kDefaultURL[] = "http://www.google.com";
 const char kUploadData[] = "hello!";
 const int kUploadDataSize = arraysize(kUploadData)-1;
 
+// SpdyNextProtos returns a vector of NPN protocol strings for negotiating
+// SPDY.
+std::vector<std::string> SpdyNextProtos();
+
 // Chop a frame into an array of MockWrites.
 // |data| is the frame to chop.
 // |length| is the length of the frame to chop.
@@ -248,6 +255,8 @@ NextProto NextProtoFromSpdyVersion(SpdyMajorVersion spdy_version);
 // spdy_session.cc.
 SpdyMajorVersion SpdyVersionFromNextProto(NextProto next_proto);
 
+AlternateProtocol AlternateProtocolFromNextProto(NextProto next_proto);
+
 class SpdyTestUtil {
  public:
   explicit SpdyTestUtil(NextProto protocol);