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

net/spdy/spdy_http_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_http_stream.h"
 
 #include "crypto/ec_private_key.h"
 #include "crypto/ec_signature_creator.h"
 #include "crypto/signature_creator.h"
 #include "net/base/asn1_util.h"
@@ skipping 10 matching lines @@
 using namespace net::test_spdy2;
 
 namespace net {
 
 class SpdyHttpStreamSpdy2Test : public testing::Test {
  public:
   OrderedSocketData* data() { return data_.get(); }
  protected:
   SpdyHttpStreamSpdy2Test() {}
 
-  virtual void SetUp() {
-    SpdySession::set_default_protocol(kProtoSPDY2);
-  }
-
   virtual void TearDown() {
     crypto::ECSignatureCreator::SetFactoryForTesting(NULL);
     UploadDataStream::ResetMergeChunks();
     MessageLoop::current()->RunUntilIdle();
   }
 
   void set_merge_chunks(bool merge) {
     UploadDataStream::set_merge_chunks(merge);
   }
 
@@ skipping 21 matching lines @@
                                BoundNetLog()));
     EXPECT_EQ(OK, callback.WaitForResult());
     return session_->InitializeWithSocket(connection.release(), false, OK);
   }
 
   SpdySessionDependencies session_deps_;
   scoped_ptr<OrderedSocketData> data_;
   scoped_refptr<HttpNetworkSession> http_session_;
   scoped_refptr<SpdySession> session_;
   scoped_refptr<TransportSocketParams> transport_params_;
-
- private:
-  SpdyTestStateHelper spdy_state_;
 };
 
 TEST_F(SpdyHttpStreamSpdy2Test, SendRequest) {
   scoped_ptr<SpdyFrame> req(ConstructSpdyGet(NULL, 0, false, 1, LOWEST));
   MockWrite writes[] = {
     CreateMockWrite(*req.get(), 1),
   };
   scoped_ptr<SpdyFrame> resp(ConstructSpdyGetSynReply(NULL, 0, 1));
   MockRead reads[] = {
     CreateMockRead(*resp, 2),
@@ skipping 288 matching lines @@
   // pool anymore.
   EXPECT_FALSE(http_session_->spdy_session_pool()->HasSession(pair));
   EXPECT_TRUE(data()->at_read_eof());
   EXPECT_TRUE(data()->at_write_eof());
 }
 
 // TODO(willchan): Write a longer test for SpdyStream that exercises all
 // methods.
 
 }  // namespace net