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

net/spdy/spdy_http_stream_spdy2_unittest.cc

Index: net/spdy/spdy_http_stream_spdy2_unittest.cc
diff --git a/net/spdy/spdy_http_stream_spdy2_unittest.cc b/net/spdy/spdy_http_stream_spdy2_unittest.cc
index 3c203deb823de66ee38fcc4334ba371c10e0fb40..f72d9a6ee81eeb5acc95c57f3ad80dc7f48c5fc8 100644
--- a/net/spdy/spdy_http_stream_spdy2_unittest.cc
+++ b/net/spdy/spdy_http_stream_spdy2_unittest.cc
@@ -28,10 +28,6 @@ class SpdyHttpStreamSpdy2Test : public testing::Test {
  protected:
   SpdyHttpStreamSpdy2Test() {}
 
-  virtual void SetUp() {
-    SpdySession::set_default_protocol(kProtoSPDY2);
-  }
-
   virtual void TearDown() {
     crypto::ECSignatureCreator::SetFactoryForTesting(NULL);
     UploadDataStream::ResetMergeChunks();
@@ -73,9 +69,6 @@ class SpdyHttpStreamSpdy2Test : public testing::Test {
   scoped_refptr<HttpNetworkSession> http_session_;
   scoped_refptr<SpdySession> session_;
   scoped_refptr<TransportSocketParams> transport_params_;
-
- private:
-  SpdyTestStateHelper spdy_state_;
 };
 
 TEST_F(SpdyHttpStreamSpdy2Test, SendRequest) {