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

net/spdy/spdy_http_stream_spdy3_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 "base/memory/scoped_ptr.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "crypto/ec_private_key.h"
 #include "crypto/ec_signature_creator.h"
 #include "crypto/signature_creator.h"
 #include "net/base/asn1_util.h"
 #include "net/base/default_server_bound_cert_store.h"
 #include "net/base/upload_data.h"
 #include "net/base/upload_data_stream.h"
 #include "net/http/http_request_info.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_response_info.h"
 #include "net/spdy/spdy_credential_builder.h"
 #include "net/spdy/spdy_http_utils.h"
 #include "net/spdy/spdy_session.h"
 #include "net/spdy/spdy_test_util_spdy3.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using namespace net::test_spdy3;
 
 namespace net {
 
+namespace {
+
+}  // namespace

[willchan no longer on Chromium, 2012/12/01 20:49:13]

?

[Ryan Hamilton, 2012/12/01 23:02:25]

Removed. 

+
 class SpdyHttpStreamSpdy3Test : public testing::Test {
  public:
   OrderedSocketData* data() { return data_.get(); }
  protected:
-  SpdyHttpStreamSpdy3Test() {}
-
-  virtual void SetUp() {
-    SpdySession::set_default_protocol(kProtoSPDY3);
+  SpdyHttpStreamSpdy3Test()
+      : ec_signature_creator_factory_(new MockECSignatureCreatorFactory()) {
   }
 
   virtual void TearDown() {
-    crypto::ECSignatureCreator::SetFactoryForTesting(NULL);
     UploadDataStream::ResetMergeChunks();
     MessageLoop::current()->RunUntilIdle();
   }
 
   void set_merge_chunks(bool merge) {
     UploadDataStream::set_merge_chunks(merge);
   }
 
   int InitSession(MockRead* reads, size_t reads_count,
                   MockWrite* writes, size_t writes_count,
@@ skipping 26 matching lines @@
     const std::string& cert,
     const std::string& proof);
 
   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_;
+  scoped_ptr<MockECSignatureCreatorFactory> ec_signature_creator_factory_;

[willchan no longer on Chromium, 2012/12/01 20:49:13]

Why bother with a scoped_ptr? Do you need to reset it sometime? Otherwise, just
embed it directly...

[Ryan Hamilton, 2012/12/01 23:02:25]

Done.

 };
 
 TEST_F(SpdyHttpStreamSpdy3Test, 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 634 matching lines @@
 
   sequenced_worker_pool->Shutdown();
 }
 
 #endif  // !defined(USE_OPENSSL)
 
 // TODO(willchan): Write a longer test for SpdyStream that exercises all
 // methods.
 
 }  // namespace net