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

net/http/http_network_layer_unittest.cc

 // 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.
 
 #include "net/base/mock_host_resolver.h"
 #include "net/base/net_log.h"
 #include "net/base/ssl_config_service_defaults.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_transaction_unittest.h"
 #include "net/proxy/proxy_service.h"
 #include "net/socket/socket_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 namespace net {
 
 namespace {
 
 class HttpNetworkLayerTest : public PlatformTest {
 };
 
 TEST_F(HttpNetworkLayerTest, CreateAndDestroy) {
   MockHostResolver host_resolver;
   net::HttpNetworkLayer factory(
       NULL,
       &host_resolver,
       NULL /* dnsrr_resolver */,
-      NULL /* ssl_host_info_factory */,
       net::ProxyService::CreateDirect(),
       new net::SSLConfigServiceDefaults,
       NULL,
       NULL,
       NULL);
 
   scoped_ptr<net::HttpTransaction> trans;
   int rv = factory.CreateTransaction(&trans);
   EXPECT_EQ(net::OK, rv);
   EXPECT_TRUE(trans.get() != NULL);
 }
 
 TEST_F(HttpNetworkLayerTest, Suspend) {
   MockHostResolver host_resolver;
   net::HttpNetworkLayer factory(
       NULL,
       &host_resolver,
       NULL /* dnsrr_resolver */,
-      NULL /* ssl_host_info_factory */,
       net::ProxyService::CreateDirect(),
       new net::SSLConfigServiceDefaults,
       NULL,
       NULL,
       NULL);
 
   scoped_ptr<net::HttpTransaction> trans;
   int rv = factory.CreateTransaction(&trans);
   EXPECT_EQ(net::OK, rv);
 
@@ skipping 27 matching lines @@
   };
   net::StaticSocketDataProvider data(data_reads, arraysize(data_reads),
                                      data_writes, arraysize(data_reads));
   mock_socket_factory.AddSocketDataProvider(&data);
 
   MockHostResolver host_resolver;
   net::HttpNetworkLayer factory(
       &mock_socket_factory,
       &host_resolver,
       NULL /* dnsrr_resolver */,
-      NULL /* ssl_host_info_factory */,
       net::ProxyService::CreateDirect(),
       new net::SSLConfigServiceDefaults,
       NULL,
       NULL,
       NULL);
 
   TestCompletionCallback callback;
 
   scoped_ptr<net::HttpTransaction> trans;
   int rv = factory.CreateTransaction(&trans);
@@ skipping 13 matching lines @@
 
   std::string contents;
   rv = ReadTransaction(trans.get(), &contents);
   EXPECT_EQ(net::OK, rv);
   EXPECT_EQ("hello world", contents);
 }
 
 }  // namespace
 
 }  // namespace net