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

net/spdy/spdy_websocket_test_util_spdy2.cc

 // Copyright (c) 2012 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_spdy2.h"
 
 #include "net/spdy/buffered_spdy_framer.h"
 #include "net/spdy/spdy_http_utils.h"
 #include "net/spdy/spdy_test_util_spdy2.h"
 
@@ skipping 65 matching lines @@
     ConvertRequestPriorityToSpdyPriority(request_priority, 2),
     CONTROL_FLAG_NONE,
     kDefaultCompressed,
     RST_STREAM_INVALID,
     kDefaultDataPointer,
     kDefaultDataLength,
     DATA_FLAG_NONE
   };
 
   // Construct SPDY SYN_STREAM control frame.
-  return ConstructSpdyPacket(
+  return ConstructSpdyFrame(
       kSynStreamHeader,
       kDefaultExtraHeaders,
       kDefaultExtraHeaderCount,
       headers,
       header_count);
 }
 
 SpdyFrame* ConstructSpdyWebSocketHandshakeResponseFrame(
     const char* const headers[],
     int header_count,
     SpdyStreamId stream_id,
     RequestPriority request_priority) {
 
   // SPDY SYN_REPLY control frame header.
   const SpdyHeaderInfo kSynReplyHeader = {
     SYN_REPLY,
     stream_id,
     kDefaultAssociatedStreamId,
     ConvertRequestPriorityToSpdyPriority(request_priority, 2),
     CONTROL_FLAG_NONE,
     kDefaultCompressed,
     RST_STREAM_INVALID,
     kDefaultDataPointer,
     kDefaultDataLength,
     DATA_FLAG_NONE
   };
 
   // Construct SPDY SYN_REPLY control frame.
-  return ConstructSpdyPacket(
+  return ConstructSpdyFrame(
       kSynReplyHeader,
       kDefaultExtraHeaders,
       kDefaultExtraHeaderCount,
       headers,
       header_count);
 }
 
 SpdyFrame* ConstructSpdyWebSocketHeadersFrame(int stream_id,
                                               const char* length,
                                               bool fin) {
@@ skipping 27 matching lines @@
   return framer.CreateDataFrame(
       stream_id,
       data,
       len,
       fin ? DATA_FLAG_FIN : DATA_FLAG_NONE);
 }
 
 }  // namespace test_spdy2
 
 }  // namespace net