SPDY - integration of spdy/3 code.

net/spdy/spdy_websocket_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 "net/spdy/spdy_websocket_stream.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "net/base/completion_callback.h"
 #include "net/proxy/proxy_server.h"
+#include "net/socket/ssl_client_socket.h"
 #include "net/spdy/spdy_http_utils.h"
 #include "net/spdy/spdy_protocol.h"
 #include "net/spdy/spdy_session.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;
 
 namespace {
@@ skipping 158 matching lines @@
   void DoSync(SpdyWebSocketStreamEvent* event) {
     sync_callback_.SetResult(OK);
   }
 
  protected:
   SpdyWebSocketStreamSpdy2Test() {}
   virtual ~SpdyWebSocketStreamSpdy2Test() {}
 
   virtual void SetUp() {
     EnableCompression(false);
+    SpdySession::set_default_protocol(SSLClientSocket::kProtoSPDY2);
     SpdySession::SetSSLMode(false);
 
     host_port_pair_.set_host("example.com");
     host_port_pair_.set_port(80);
     host_port_proxy_pair_.first = host_port_pair_;
     host_port_proxy_pair_.second = ProxyServer::Direct();
 
     const size_t max_concurrent_streams = 1;
-    spdy::SettingsFlagsAndId id(0);
-    id.set_id(spdy::SETTINGS_MAX_CONCURRENT_STREAMS);
-
-    id.set_flags(spdy::SETTINGS_FLAG_PLEASE_PERSIST);
+    spdy::SettingsFlagsAndId id(spdy::SETTINGS_FLAG_PLEASE_PERSIST,
+                                spdy::SETTINGS_MAX_CONCURRENT_STREAMS);
     spdy_settings_to_set_.push_back(
         spdy::SpdySetting(id, max_concurrent_streams));
 
-    id.set_flags(spdy::SETTINGS_FLAG_PERSISTED);
+    spdy::SettingsFlagsAndId id1(spdy::SETTINGS_FLAG_PERSISTED,
+                                 spdy::SETTINGS_MAX_CONCURRENT_STREAMS);
     spdy_settings_to_send_.push_back(
-        spdy::SpdySetting(id, max_concurrent_streams));
+        spdy::SpdySetting(id1, max_concurrent_streams));
   }
+
   virtual void TearDown() {
     MessageLoop::current()->RunAllPending();
   }
 
   void EnableCompression(bool enabled) {
     spdy::SpdyFramer::set_enable_compression_default(enabled);
   }
   void Prepare(spdy::SpdyStreamId stream_id) {
     stream_id_ = stream_id;
 
@@ skipping 398 matching lines @@
   EXPECT_EQ(OK, events[7].result);
 
   // EOF close SPDY session.
   EXPECT_TRUE(!http_session_->spdy_session_pool()->HasSession(
       host_port_proxy_pair_));
   EXPECT_TRUE(data()->at_read_eof());
   EXPECT_TRUE(data()->at_write_eof());
 }
 
 }  // namespace net