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

net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc

Index: net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc
diff --git a/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc b/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc
index 424514c9d1ca3f556b56e82a8802b844a0e41293..5216e4a97c4e7bbdbf3c3bde4727fa9eff85f76a 100644
--- a/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc
+++ b/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc
@@ -67,10 +67,6 @@ class SpdyProxyClientSocketSpdy2Test : public PlatformTest {
   virtual void TearDown();
 
  protected:
-  virtual void SetUp() {
-    SpdySession::set_default_protocol(kProtoSPDY2);
-  }
-
   void Initialize(MockRead* reads, size_t reads_count, MockWrite* writes,
                   size_t writes_count);
   SpdyFrame* ConstructConnectRequestFrame();
@@ -131,7 +127,6 @@ class SpdyProxyClientSocketSpdy2Test : public PlatformTest {
   ProxyServer proxy_;
   HostPortProxyPair endpoint_host_port_proxy_pair_;
   scoped_refptr<TransportSocketParams> transport_params_;
-  SpdyTestStateHelper spdy_state_;
 
   DISALLOW_COPY_AND_ASSIGN(SpdyProxyClientSocketSpdy2Test);
 };
@@ -145,7 +140,7 @@ SpdyProxyClientSocketSpdy2Test::SpdyProxyClientSocketSpdy2Test()
       connect_data_(SYNCHRONOUS, OK),
       spdy_session_(NULL),
       spdy_stream_(NULL),
-      framer_(2),
+      framer_(2, false),
       user_agent_(kUserAgent),
       url_(kRequestUrl),
       proxy_host_port_(kProxyHost, kProxyPort),