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

net/http/http_network_transaction_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/http/http_network_transaction.h"
 
 #include <math.h>  // ceil
 #include <stdarg.h>
 #include <string>
 #include <vector>
@@ skipping 134 matching lines @@
 
 class HttpNetworkTransactionSpdy2Test : public PlatformTest {
  protected:
   struct SimpleGetHelperResult {
     int rv;
     std::string status_line;
     std::string response_data;
   };
 
   virtual void SetUp() {
-    SpdySession::set_default_protocol(kProtoSPDY2);
     NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests();
     MessageLoop::current()->RunUntilIdle();
   }
 
   virtual void TearDown() {
     NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests();
     MessageLoop::current()->RunUntilIdle();
     // Empty the current queue.
     MessageLoop::current()->RunUntilIdle();
     PlatformTest::TearDown();
@@ skipping 76 matching lines @@
                                         size_t reads_count) {
     StaticSocketDataProvider reads(data_reads, reads_count, NULL, 0);
     StaticSocketDataProvider* data[] = { &reads };
     return SimpleGetHelperForData(data, 1);
   }
 
   void ConnectStatusHelperWithExpectedStatus(const MockRead& status,
                                              int expected_status);
 
   void ConnectStatusHelper(const MockRead& status);
-
- private:
-  SpdyTestStateHelper spdy_state_;
 };
 
 namespace {
 
 // Fill |str| with a long header list that consumes >= |size| bytes.
 void FillLargeHeadersString(std::string* str, int size) {
   const char* row =
       "SomeHeaderName: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\r\n";
   const int sizeof_row = strlen(row);
   const int num_rows = static_cast<int>(
@@ skipping 9915 matching lines @@
             trans2.Start(&request2, callback2.callback(), BoundNetLog()));
   MessageLoop::current()->RunUntilIdle();
   data2->RunFor(3);
 
   ASSERT_TRUE(callback2.have_result());
   EXPECT_EQ(OK, callback2.WaitForResult());
   EXPECT_TRUE(trans2.GetResponseInfo()->was_fetched_via_spdy);
 }
 
 }  // namespace net