WebSocket over SPDY: update test data and expectation

net/spdy/spdy_stream_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 "base/memory/ref_counted.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_log_unittest.h"
 #include "net/spdy/buffered_spdy_framer.h"
 #include "net/spdy/spdy_stream.h"
 #include "net/spdy/spdy_http_utils.h"
 #include "net/spdy/spdy_session.h"
 #include "net/spdy/spdy_stream_test_util.h"
 #include "net/spdy/spdy_test_util_spdy2.h"
+#include "net/spdy/spdy_websocket_test_util_spdy2.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using namespace net::test_spdy2;
 
 // TODO(ukai): factor out common part with spdy_http_stream_unittest.cc
 //
 namespace net {
 
 namespace {
 
@@ skipping 148 matching lines @@
   EXPECT_EQ(8, delegate->data_sent());
   EXPECT_TRUE(delegate->closed());
 }
 
 TEST_F(SpdyStreamSpdy2Test, SendHeaderAndDataAfterOpen) {
   SpdySessionDependencies session_deps;
 
   session_ = SpdySessionDependencies::SpdyCreateSession(&session_deps);
   SpdySessionPoolPeer pool_peer_(session_->spdy_session_pool());
 
-  scoped_ptr<SpdyFrame> expected_request(ConstructSpdyWebSocket(
+  scoped_ptr<SpdyFrame> expected_request(ConstructSpdyWebSocketSynStream(
       1,
       "/chat",
       "server.example.com",
       "http://example.com"));
   scoped_ptr<SpdyFrame> expected_headers(ConstructSpdyWebSocketHeadersFrame(
       1, "6", true));
   scoped_ptr<SpdyFrame> expected_message(ConstructSpdyBodyFrame("hello!", 6));
   MockWrite writes[] = {
     CreateMockWrite(*expected_request),
     CreateMockWrite(*expected_headers),
@@ skipping 32 matching lines @@
   EXPECT_EQ(OK, connection->Init(host_port_pair.ToString(), transport_params,
                                  LOWEST, CompletionCallback(),
                                  session_->GetTransportSocketPool(
                                      HttpNetworkSession::NORMAL_SOCKET_POOL),
                                  BoundNetLog()));
   session->InitializeWithSocket(connection.release(), false, OK);
 
   scoped_refptr<SpdyStream> stream;
   ASSERT_EQ(
       OK,
-      session->CreateStream(url, LOWEST, &stream, BoundNetLog(),
+      session->CreateStream(url, HIGHEST, &stream, BoundNetLog(),
                             CompletionCallback()));
   scoped_refptr<IOBufferWithSize> buf(new IOBufferWithSize(6));
   memcpy(buf->data(), "hello!", 6);
   TestCompletionCallback callback;
   scoped_ptr<SpdyHeaderBlock> message_headers(new SpdyHeaderBlock);
   (*message_headers)["opcode"] = "1";
   (*message_headers)["length"] = "6";
   (*message_headers)["fin"] = "1";
 
   scoped_ptr<TestSpdyStreamDelegate> delegate(
@@ skipping 213 matching lines @@
       net::NetLog::PHASE_NONE);
 
   int stream_id2;
   ASSERT_TRUE(entries[pos].GetIntegerValue("stream_id", &stream_id2));
   EXPECT_EQ(static_cast<int>(stream_id), stream_id2);
 }
 
 } //namespace test
 
 }  // namespace net