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

net/spdy/spdy_proxy_client_socket_spdy2_unittest.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_proxy_client_socket.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/utf_string_conversions.h"
 #include "net/base/address_list.h"
@@ skipping 319 matching lines @@
     0,
     DATA_FLAG_NONE
   };
   const char* const kConnectHeaders[] = {
     "method", "CONNECT",
     "url", kOriginHostPort,
     "host", kOriginHost,
     "user-agent", kUserAgent,
     "version", "HTTP/1.1",
   };
-  return ConstructSpdyPacket(
+  return ConstructSpdyFrame(
       kSynStartHeader, NULL, 0, kConnectHeaders, arraysize(kConnectHeaders)/2);
 }
 
 // Constructs a SPDY SYN_STREAM frame for a CONNECT request which includes
 // Proxy-Authorization headers.
 SpdyFrame*
 SpdyProxyClientSocketSpdy2Test::ConstructConnectAuthRequestFrame() {
   const SpdyHeaderInfo kSynStartHeader = {
     SYN_STREAM,
     kStreamId,
     0,
     net::ConvertRequestPriorityToSpdyPriority(LOWEST, 2),
     CONTROL_FLAG_NONE,
     false,
     RST_STREAM_INVALID,
     NULL,
     0,
     DATA_FLAG_NONE
   };
   const char* const kConnectHeaders[] = {
     "method", "CONNECT",
     "url", kOriginHostPort,
     "host", kOriginHost,
     "user-agent", kUserAgent,
     "version", "HTTP/1.1",
     "proxy-authorization", "Basic Zm9vOmJhcg==",
   };
-  return ConstructSpdyPacket(
+  return ConstructSpdyFrame(
       kSynStartHeader, NULL, 0, kConnectHeaders, arraysize(kConnectHeaders)/2);
 }
 
 // Constructs a standard SPDY SYN_REPLY frame to match the SPDY CONNECT.
 SpdyFrame* SpdyProxyClientSocketSpdy2Test::ConstructConnectReplyFrame() {
   const char* const kStandardReplyHeaders[] = {
       "status", "200 Connection Established",
       "version", "HTTP/1.1"
   };
   return ConstructSpdyControlFrame(NULL,
@@ skipping 1028 matching lines @@
                                          write_callback_.callback()));
 
   Run(2);
 
   EXPECT_FALSE(sock_.get());
   EXPECT_TRUE(read_callback.have_result());
   EXPECT_FALSE(write_callback_.have_result());
 }
 
 }  // namespace net