Clean up SpdySessionDependencies to remove code duplication.

net/spdy/spdy_test_util_spdy2.h

 // 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.
 
 #ifndef NET_SPDY_SPDY_TEST_UTIL_H_
 #define NET_SPDY_SPDY_TEST_UTIL_H_
 
 #include "base/basictypes.h"
 #include "net/base/cert_verifier.h"
 #include "net/base/host_port_pair.h"
@@ skipping 321 matching lines @@
 
 MockRead CreateMockRead(const SpdyFrame& resp, int seq, IoMode mode);
 
 // Combines the given SpdyFrames into the given char array and returns
 // the total length.
 int CombineFrames(const SpdyFrame** frames, int num_frames,
                   char* buff, int buff_len);
 
 // Helper to manage the lifetimes of the dependencies for a
 // HttpNetworkTransaction.
 class SpdySessionDependencies {

[willchan no longer on Chromium, 2012/12/01 21:00:22]

We should probably make this a struct at some point. If that's easy to do here,
can you make that change?

[Ryan Hamilton, 2012/12/01 22:26:41]

Done.

  public:
   // Default set of dependencies -- "null" proxy service.
   SpdySessionDependencies();
 
   // Custom proxy service dependency.
   explicit SpdySessionDependencies(ProxyService* proxy_service);
 
   ~SpdySessionDependencies();
 
   static HttpNetworkSession* SpdyCreateSession(
       SpdySessionDependencies* session_deps);
   static HttpNetworkSession* SpdyCreateSessionDeterministic(
       SpdySessionDependencies* session_deps);
 
+  net::HttpNetworkSession::Params CreateSessionParams();

[willchan no longer on Chromium, 2012/12/01 21:00:22]

If it would not require a lot of manual effort (your time is more valuable than
this nit), can you keep this static too, to be consistent with the others?

[Ryan Hamilton, 2012/12/01 22:26:41]

Done.  (only used in a couple places)

+
   // NOTE: host_resolver must be ordered before http_auth_handler_factory.
   scoped_ptr<MockHostResolverBase> host_resolver;
   scoped_ptr<CertVerifier> cert_verifier;
   scoped_ptr<ProxyService> proxy_service;
   scoped_refptr<SSLConfigService> ssl_config_service;
   scoped_ptr<MockClientSocketFactory> socket_factory;
   scoped_ptr<DeterministicMockClientSocketFactory> deterministic_socket_factory;
   scoped_ptr<HttpAuthHandlerFactory> http_auth_handler_factory;
   HttpServerPropertiesImpl http_server_properties;
   std::string trusted_spdy_proxy;
+  NetLog* net_log;
 };
 
 class SpdyURLRequestContext : public URLRequestContext {
  public:
   SpdyURLRequestContext();
   virtual ~SpdyURLRequestContext();
 
   MockClientSocketFactory& socket_factory() { return socket_factory_; }
 
  private:
@@ skipping 42 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SpdyTestStateHelper);
 };
 
 }  // namespace test_spdy2
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_TEST_UTIL_H_