[SPDY] Unfork websocket_handshake_handler_spdy{2,3}_unittest.cc

net/spdy/spdy_websocket_test_util.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/spdy/spdy_websocket_test_util.h"
 
 #include "net/spdy/buffered_spdy_framer.h"
 #include "net/spdy/spdy_http_utils.h"
 
 namespace net {
 
 static const int kDefaultAssociatedStreamId = 0;
 static const bool kDefaultCompressed = false;
 static const char* const kDefaultDataPointer = NULL;
 static const uint32 kDefaultDataLength = 0;
 static const char** const kDefaultExtraHeaders = NULL;
 static const int kDefaultExtraHeaderCount = 0;
 
 SpdyWebSocketTestUtil::SpdyWebSocketTestUtil(
     NextProto protocol) : spdy_util_(protocol) {}
 
+std::string SpdyWebSocketTestUtil::GetHeader(const SpdyHeaderBlock& headers,
+                                             const std::string& key) const {
+  SpdyHeaderBlock::const_iterator it = headers.find(GetHeaderKey(key));
+  return (it == headers.end()) ? "" : it->second;
+}
+
 void SpdyWebSocketTestUtil::SetHeader(
     const std::string& key,
     const std::string& value,
     SpdyHeaderBlock* headers) const {
-  (*headers)[(spdy_util_.is_spdy2() ? "" : ":") + key] = value;
+  (*headers)[GetHeaderKey(key)] = value;
 }
 
 SpdyFrame* SpdyWebSocketTestUtil::ConstructSpdyWebSocketSynStream(
     int stream_id,
     const char* path,
     const char* host,
     const char* origin) {
   scoped_ptr<SpdyHeaderBlock> headers(new SpdyHeaderBlock());
   SetHeader("path", path, headers.get());
   SetHeader("host", host, headers.get());
@@ skipping 102 matching lines @@
       data,
       len,
       fin ? DATA_FLAG_FIN : DATA_FLAG_NONE);
 }
 
 SpdyFrame* SpdyWebSocketTestUtil::ConstructSpdySettings(
     const SettingsMap& settings) const {
   return spdy_util_.ConstructSpdySettings(settings);
 }
 
+SpdyMajorVersion SpdyWebSocketTestUtil::spdy_version() const {
+  return spdy_util_.spdy_version();
+}
+
+std::string SpdyWebSocketTestUtil::GetHeaderKey(
+    const std::string& key) const {
+  return (spdy_util_.is_spdy2() ? "" : ":") + key;
+}
+
 }  // namespace net