Move a number of static variables SPDY to HttpNetworkSession::Params.

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"
@@ skipping 167 matching lines @@
 
   void DoSync(SpdyWebSocketStreamEvent* event) {
     sync_callback_.callback().Run(OK);
   }
 
  protected:
   SpdyWebSocketStreamSpdy2Test() {}
   virtual ~SpdyWebSocketStreamSpdy2Test() {}
 
   virtual void SetUp() {
-    SpdySession::set_default_protocol(kProtoSPDY2);
-
     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();
 
     spdy_settings_id_to_set_ = SETTINGS_MAX_CONCURRENT_STREAMS;
     spdy_settings_flags_to_set_ = SETTINGS_FLAG_PLEASE_PERSIST;
     spdy_settings_value_to_set_ = 1;
 
     spdy_settings_to_send_[spdy_settings_id_to_set_] =
@@ skipping 94 matching lines @@
   scoped_ptr<SpdyFrame> closing_frame_;
   HostPortPair host_port_pair_;
   HostPortProxyPair host_port_proxy_pair_;
   TestCompletionCallback completion_callback_;
   TestCompletionCallback sync_callback_;
 
   static const char kMessageFrame[];
   static const char kClosingFrame[];
   static const size_t kMessageFrameLength;
   static const size_t kClosingFrameLength;
-
- private:
-  SpdyTestStateHelper spdy_state_;
 };
 
 // TODO(toyoshim): Replace old framing data to new one, then use HEADERS and
 // data frames.
 const char SpdyWebSocketStreamSpdy2Test::kMessageFrame[] = "\x81\x05hello";
 const char SpdyWebSocketStreamSpdy2Test::kClosingFrame[] = "\x88\0";
 const size_t SpdyWebSocketStreamSpdy2Test::kMessageFrameLength =
     arraysize(SpdyWebSocketStreamSpdy2Test::kMessageFrame) - 1;
 const size_t SpdyWebSocketStreamSpdy2Test::kClosingFrameLength =
     arraysize(SpdyWebSocketStreamSpdy2Test::kClosingFrame) - 1;
@@ skipping 294 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