WebSocket over SPDY: update test data and expectation

net/spdy/spdy_test_util_spdy2.h

Index: net/spdy/spdy_test_util_spdy2.h
diff --git a/net/spdy/spdy_test_util_spdy2.h b/net/spdy/spdy_test_util_spdy2.h
index 58332140a638a78ca04229688699c2fbf420bdf7..dc8a3626d97878775795f65f38e23b3fcb93a7a3 100644
--- a/net/spdy/spdy_test_util_spdy2.h
+++ b/net/spdy/spdy_test_util_spdy2.h
@@ -228,13 +228,6 @@ SpdyFrame* ConstructSpdyConnect(const char* const extra_headers[],
                                 int extra_header_count,
                                 int stream_id);
 
-// Constructs a standard SPDY SYN_STREAM frame for WebSocket over SPDY
-// opening handshake.
-SpdyFrame* ConstructSpdyWebSocket(int stream_id,
-                                  const char* path,
-                                  const char* host,
-                                  const char* origin);
-
 // Constructs a standard SPDY push SYN packet.
 // |extra_headers| are the extra header-value pairs, which typically
 // will vary the most between calls.
@@ -277,11 +270,6 @@ SpdyFrame* ConstructSpdyGetSynReply(const char* const extra_headers[],
 // Returns a SpdyFrame.
 SpdyFrame* ConstructSpdyGetSynReplyRedirect(int stream_id);
 
-// Constructs a standard SPDY SYN_REPLY packet to match the WebSocket over SPDY
-// opening handshake.
-// Returns a SpdyFrame.
-SpdyFrame* ConstructSpdyWebSocketSynReply(int stream_id);
-
 // Constructs a standard SPDY SYN_REPLY packet with an Internal Server
 // Error status code.
 // Returns a SpdyFrame.
@@ -324,11 +312,6 @@ SpdyFrame* ConstructSpdyBodyFrame(int stream_id,
 SpdyFrame* ConstructSpdyBodyFrame(int stream_id, const char* data,
                                   uint32 len, bool fin);
 
-// Constructs a SPDY HEADERS frame for a WebSocket frame over SPDY.
-SpdyFrame* ConstructSpdyWebSocketHeadersFrame(int stream_id,
-                                              const char* length,
-                                              bool fin);
-
 // Wraps |frame| in the payload of a data frame in stream |stream_id|.
 SpdyFrame* ConstructWrappedSpdyFrame(const scoped_ptr<SpdyFrame>& frame,
                                      int stream_id);