Revert 62918 - net: clean up SSLHostInfo construction....

net/spdy/spdy_test_util.h

 // Copyright (c) 2010 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_
 #pragma once
 
 #include "base/basictypes.h"
 #include "net/base/mock_host_resolver.h"
@@ skipping 336 matching lines @@
   scoped_refptr<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;
 
   static HttpNetworkSession* SpdyCreateSession(
       SpdySessionDependencies* session_deps) {
     return new HttpNetworkSession(session_deps->host_resolver.get(),
                                   NULL /* dnsrr_resolver */,
-                                  NULL /* ssl_host_info_factory */,
                                   session_deps->proxy_service,
                                   session_deps->socket_factory.get(),
                                   session_deps->ssl_config_service,
                                   new SpdySessionPool(NULL),
                                   session_deps->http_auth_handler_factory.get(),
                                   NULL,
                                   NULL);
   }
   static HttpNetworkSession* SpdyCreateSessionDeterministic(
       SpdySessionDependencies* session_deps) {
     return new HttpNetworkSession(session_deps->host_resolver.get(),
                                   NULL /* dnsrr_resolver */,
-                                  NULL /* ssl_host_info_factory */,
                                   session_deps->proxy_service,
                                   session_deps->
                                       deterministic_socket_factory.get(),
                                   session_deps->ssl_config_service,
                                   new SpdySessionPool(NULL),
                                   session_deps->http_auth_handler_factory.get(),
                                   NULL,
                                   NULL);
   }
 };
 
 class SpdyURLRequestContext : public URLRequestContext {
  public:
   SpdyURLRequestContext() {
     host_resolver_ = new MockHostResolver();
     proxy_service_ = ProxyService::CreateDirect();
     ssl_config_service_ = new SSLConfigServiceDefaults;
     http_auth_handler_factory_ = HttpAuthHandlerFactory::CreateDefault(
         host_resolver_);
     http_transaction_factory_ = new net::HttpCache(
         new HttpNetworkLayer(&socket_factory_,
                              host_resolver_,
                              NULL /* dnsrr_resolver */,
-                             NULL /* ssl_host_info_factory */,
                              proxy_service_,
                              ssl_config_service_,
                              new SpdySessionPool(NULL),
                              http_auth_handler_factory_,
                              network_delegate_,
                              NULL),
         net::HttpCache::DefaultBackend::InMemory(0));
   }
 
   MockClientSocketFactory& socket_factory() { return socket_factory_; }
 
  protected:
   virtual ~SpdyURLRequestContext() {
     delete http_transaction_factory_;
     delete http_auth_handler_factory_;
     delete host_resolver_;
   }
 
  private:
   MockClientSocketFactory socket_factory_;
 };
 
 const SpdyHeaderInfo make_spdy_header(spdy::SpdyControlType type);
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_TEST_UTIL_H_