Revert 62918 - net: clean up SSLHostInfo construction.

Create an SSLHostInfoFactory interface and plumb it from the HttpCache
to the SSLConnectJob. Also, move the SSLHostInfo reference from the
ssl_config to being passed to the SSLClientSocket.

BUG=none
TEST=net_unittests

Review URL: http://codereview.chromium.org/3747003

TBR=agl@chromium.org
Review URL: http://codereview.chromium.org/3846005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62922 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/net/connection_tester.cc

@@ -65,8 +65,8 @@ class ExperimentURLRequestContext : public URLRequestContext {
         host_resolver_);
     http_transaction_factory_ = new net::HttpCache(
         net::HttpNetworkLayer::CreateFactory(host_resolver_, dnsrr_resolver_,
-            NULL /* ssl_host_info_factory */, proxy_service_,
-            ssl_config_service_, http_auth_handler_factory_, NULL, NULL),
+            proxy_service_, ssl_config_service_, http_auth_handler_factory_,
+            NULL, NULL),
         net::HttpCache::DefaultBackend::InMemory(0));
     // In-memory cookie store.
     cookie_store_ = new net::CookieMonster(NULL, NULL);

chrome/service/net/service_url_request_context.cc

@@ -43,7 +43,6 @@ ServiceURLRequestContext::ServiceURLRequestContext() {
   http_transaction_factory_ = new net::HttpCache(
       net::HttpNetworkLayer::CreateFactory(host_resolver_,
                                            dnsrr_resolver_,
-                                           NULL /* ssl_host_info_factory */,
                                            proxy_service_,
                                            ssl_config_service_,
                                            http_auth_handler_factory_,

chrome/test/plugin/plugin_test.cpp

@@ -235,7 +235,6 @@ class PluginInstallerDownloadTest
       http_transaction_factory_ = new net::HttpCache(
           net::HttpNetworkLayer::CreateFactory(host_resolver_,
                                                NULL /* dnsrr_resolver */,
-                                               NULL /* ssl_host_info_factory */,
                                                proxy_service_,
                                                ssl_config_service_,
                                                http_auth_handler_factory_,

chrome_frame/metrics_service.cc

@@ -177,7 +177,6 @@ class ChromeFrameUploadRequestContext : public URLRequestContext {
     http_transaction_factory_ = new net::HttpCache(
         net::HttpNetworkLayer::CreateFactory(host_resolver_,
                                              NULL /* dnsrr_resovler */,
-                                             NULL /* ssl_host_info */,
                                              proxy_service_,
                                              ssl_config_service_,
                                              http_auth_handler_factory_,

chrome_frame/test/test_server_test.cc

@@ -70,8 +70,7 @@ class URLRequestTestContext : public URLRequestContext {
         host_resolver_);
     http_transaction_factory_ = new net::HttpCache(
         net::HttpNetworkLayer::CreateFactory(
-            host_resolver_, NULL /* dnsrr_resolver */,
-            NULL /* ssl_host_info_factory */, proxy_service_,
+            host_resolver_, NULL /* dnsrr_resolver */, proxy_service_,
             ssl_config_service_, http_auth_handler_factory_, NULL, NULL),
         net::HttpCache::DefaultBackend::InMemory(0));
     // In-memory cookie store.

jingle/notifier/base/chrome_async_socket.cc

@@ -435,8 +435,7 @@ bool ChromeAsyncSocket::StartTls(const std::string& domain_name) {
   DCHECK(transport_socket_.get());
   transport_socket_.reset(
       client_socket_factory_->CreateSSLClientSocket(
-          transport_socket_.release(), domain_name, ssl_config_,
-          NULL /* ssl_host_info */));
+          transport_socket_.release(), domain_name, ssl_config_));
   int status = transport_socket_->Connect(&ssl_connect_callback_);
   if (status != net::ERR_IO_PENDING) {
     MessageLoop* message_loop = MessageLoop::current();

jingle/notifier/base/xmpp_client_socket_factory.cc

@@ -33,10 +33,9 @@ net::ClientSocket* XmppClientSocketFactory::CreateTCPClientSocket(
 net::SSLClientSocket* XmppClientSocketFactory::CreateSSLClientSocket(
     net::ClientSocketHandle* transport_socket,
     const std::string& hostname,
-    const net::SSLConfig& ssl_config,
-    net::SSLHostInfo* ssl_host_info) {
+    const net::SSLConfig& ssl_config) {
   return client_socket_factory_->CreateSSLClientSocket(
-      transport_socket, hostname, ssl_config, ssl_host_info);
+      transport_socket, hostname, ssl_config);
 }
 
 }  // namespace

jingle/notifier/base/xmpp_client_socket_factory.h

@@ -9,10 +9,6 @@
 
 #include "net/socket/client_socket_factory.h"
 
-namespace net {
-class SSLHostInfo;
-}
-
 namespace notifier {
 
 class XmppClientSocketFactory : public net::ClientSocketFactory {
@@ -30,7 +26,7 @@ class XmppClientSocketFactory : public net::ClientSocketFactory {
       const net::NetLog::Source& source);
   virtual net::SSLClientSocket* CreateSSLClientSocket(
       net::ClientSocketHandle* transport_socket, const std::string& hostname,
-      const net::SSLConfig& ssl_config, net::SSLHostInfo* ssl_host_info);
+      const net::SSLConfig& ssl_config);
 
  private:
   net::ClientSocketFactory* const client_socket_factory_;

net/base/ssl_config_service.h

@@ -77,6 +77,12 @@ struct SSLConfig {
   std::string next_protos;
 
   scoped_refptr<X509Certificate> client_cert;
+
+  // ssl_host_info contains an optional context that is needed for Snap Start.
+  // If provided, the SSL socket will assume that the application protocol is
+  // client-speaks-first. Also needs SSLConfigService::EnableSnapStart to
+  // have been called.
+  scoped_refptr<SSLHostInfo> ssl_host_info;
 };
 
 // The interface for retrieving the SSL configuration.  This interface

net/base/ssl_host_info.h

@@ -15,10 +15,9 @@ namespace net {
 // This information may be stored on disk so does not include keys or session
 // information etc. Primarily it's intended for caching the server's
 // certificates.
-class SSLHostInfo {
+class SSLHostInfo :
+    public base::RefCountedThreadSafe<SSLHostInfo> {
  public:
-  virtual ~SSLHostInfo();
-
   // Start will commence the lookup. This must be called before any other
   // methods. By opportunistically calling this early, it may be possible to
   // overlap this object's lookup and reduce latency.
@@ -46,15 +45,10 @@ class SSLHostInfo {
   // this object and the store operation will still complete. This can only be
   // called once WaitForDataReady has returned OK or called its callback.
   virtual void Set(const std::string& new_data) = 0;
-};
-
-class SSLHostInfoFactory {
- public:
-  virtual ~SSLHostInfoFactory();
 
-  // GetForHost returns a fresh, allocated SSLHostInfo for the given hostname
-  // or NULL on failure.
-  virtual SSLHostInfo* GetForHost(const std::string& hostname) = 0;
+ protected:
+  friend class base::RefCountedThreadSafe<SSLHostInfo>;
+  virtual ~SSLHostInfo() { }
 };
 
 }  // namespace net

net/http/disk_cache_based_ssl_host_info.cc

@@ -34,8 +34,7 @@ void DiskCacheBasedSSLHostInfo::Start() {
 
 DiskCacheBasedSSLHostInfo::~DiskCacheBasedSSLHostInfo() {
   DCHECK(!user_callback_);
-  if (entry_)
-    entry_->Close();
+  DCHECK(!entry_);
   callback_->Cancel();
 }
 

net/http/http_cache.cc

@@ -24,9 +24,7 @@
 #include "net/base/io_buffer.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
-#include "net/base/ssl_host_info.h"
 #include "net/disk_cache/disk_cache.h"
-#include "net/http/disk_cache_based_ssl_host_info.h"
 #include "net/http/http_cache_transaction.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_network_session.h"
@@ -244,22 +242,6 @@ void HttpCache::MetadataWriter::OnIOComplete(int result) {
 
 //-----------------------------------------------------------------------------
 
-class HttpCache::SSLHostInfoFactoryAdaptor : public SSLHostInfoFactory {
- public:
-  SSLHostInfoFactoryAdaptor(HttpCache* http_cache)
-      : http_cache_(http_cache) {
-  }
-
-  SSLHostInfo* GetForHost(const std::string& hostname) {
-    return new DiskCacheBasedSSLHostInfo(hostname, http_cache_);
-  }
-
- private:
-  HttpCache* const http_cache_;
-};
-
-//-----------------------------------------------------------------------------
-
 HttpCache::HttpCache(HostResolver* host_resolver,
                      DnsRRResolver* dnsrr_resolver,
                      ProxyService* proxy_service,
@@ -271,11 +253,8 @@ HttpCache::HttpCache(HostResolver* host_resolver,
     : backend_factory_(backend_factory),
       building_backend_(false),
       mode_(NORMAL),
-      ssl_host_info_factory_(new SSLHostInfoFactoryAdaptor(
-            ALLOW_THIS_IN_INITIALIZER_LIST(this))),
       network_layer_(HttpNetworkLayer::CreateFactory(host_resolver,
-          dnsrr_resolver, ssl_host_info_factory_.get(),
-          proxy_service, ssl_config_service,
+          dnsrr_resolver, proxy_service, ssl_config_service,
           http_auth_handler_factory, network_delegate, net_log)),
       ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)),
       enable_range_support_(true) {

net/http/http_cache.h

@@ -116,7 +116,7 @@ class HttpCache : public HttpTransactionFactory,
   };
 
   // The disk cache is initialized lazily (by CreateTransaction) in this case.
-  // The HttpCache takes ownership of the |backend_factory|.
+  // The  HttpCache takes ownership of the |backend_factory|.
   HttpCache(HostResolver* host_resolver,
             DnsRRResolver* dnsrr_resolver,
             ProxyService* proxy_service,
@@ -200,7 +200,6 @@ class HttpCache : public HttpTransactionFactory,
 
   class BackendCallback;
   class MetadataWriter;
-  class SSLHostInfoFactoryAdaptor;
   class Transaction;
   class WorkItem;
   friend class Transaction;
@@ -354,8 +353,6 @@ class HttpCache : public HttpTransactionFactory,
 
   Mode mode_;
 
-  scoped_ptr<SSLHostInfoFactoryAdaptor> ssl_host_info_factory_;
-
   scoped_ptr<HttpTransactionFactory> network_layer_;
   scoped_ptr<disk_cache::Backend> disk_cache_;
 

net/http/http_cache_transaction.cc

@@ -625,6 +625,16 @@ int HttpCache::Transaction::DoSendRequest() {
     return rv;
 
   next_state_ = STATE_SEND_REQUEST_COMPLETE;
+  if (request_->url.SchemeIs("https") &&
+      SSLConfigService::snap_start_enabled()) {
+    // TODO(agl): in order to support AlternateProtocol there should probably
+    // be an object hanging off the HttpNetworkSession which constructs these.
+    // Note: when this test is removed, don't forget to remove the #include of
+    // ssl_config_service.h
+    scoped_refptr<DiskCacheBasedSSLHostInfo> hostinfo =
+        new DiskCacheBasedSSLHostInfo(request_->url.host(), cache_);
+    network_trans_->SetSSLHostInfo(hostinfo.get());
+  }
   rv = network_trans_->Start(request_, &io_callback_, net_log_);
   return rv;
 }

net/http/http_network_layer.cc

@@ -22,7 +22,6 @@ namespace net {
 HttpTransactionFactory* HttpNetworkLayer::CreateFactory(
     HostResolver* host_resolver,
     DnsRRResolver* dnsrr_resolver,
-    SSLHostInfoFactory* ssl_host_info_factory,
     ProxyService* proxy_service,
     SSLConfigService* ssl_config_service,
     HttpAuthHandlerFactory* http_auth_handler_factory,
@@ -31,8 +30,7 @@ HttpTransactionFactory* HttpNetworkLayer::CreateFactory(
   DCHECK(proxy_service);
 
   return new HttpNetworkLayer(ClientSocketFactory::GetDefaultFactory(),
-                              host_resolver, dnsrr_resolver,
-                              ssl_host_info_factory, proxy_service,
+                              host_resolver, dnsrr_resolver, proxy_service,
                               ssl_config_service, http_auth_handler_factory,
                               network_delegate,
                               net_log);
@@ -51,7 +49,6 @@ HttpNetworkLayer::HttpNetworkLayer(
     ClientSocketFactory* socket_factory,
     HostResolver* host_resolver,
     DnsRRResolver* dnsrr_resolver,
-    SSLHostInfoFactory* ssl_host_info_factory,
     ProxyService* proxy_service,
     SSLConfigService* ssl_config_service,
     HttpAuthHandlerFactory* http_auth_handler_factory,
@@ -60,7 +57,6 @@ HttpNetworkLayer::HttpNetworkLayer(
     : socket_factory_(socket_factory),
       host_resolver_(host_resolver),
       dnsrr_resolver_(dnsrr_resolver),
-      ssl_host_info_factory_(ssl_host_info_factory),
       proxy_service_(proxy_service),
       ssl_config_service_(ssl_config_service),
       session_(NULL),
@@ -77,7 +73,6 @@ HttpNetworkLayer::HttpNetworkLayer(
     ClientSocketFactory* socket_factory,
     HostResolver* host_resolver,
     DnsRRResolver* dnsrr_resolver,
-    SSLHostInfoFactory* ssl_host_info_factory,
     ProxyService* proxy_service,
     SSLConfigService* ssl_config_service,
     SpdySessionPool* spdy_session_pool,
@@ -87,7 +82,6 @@ HttpNetworkLayer::HttpNetworkLayer(
     : socket_factory_(socket_factory),
       host_resolver_(host_resolver),
       dnsrr_resolver_(dnsrr_resolver),
-      ssl_host_info_factory_(ssl_host_info_factory),
       proxy_service_(proxy_service),
       ssl_config_service_(ssl_config_service),
       session_(NULL),
@@ -103,7 +97,6 @@ HttpNetworkLayer::HttpNetworkLayer(
 HttpNetworkLayer::HttpNetworkLayer(HttpNetworkSession* session)
     : socket_factory_(ClientSocketFactory::GetDefaultFactory()),
       dnsrr_resolver_(NULL),
-      ssl_host_info_factory_(NULL),
       ssl_config_service_(NULL),
       session_(session),
       spdy_session_pool_(NULL),
@@ -144,7 +137,6 @@ HttpNetworkSession* HttpNetworkLayer::GetSession() {
     session_ = new HttpNetworkSession(
         host_resolver_,
         dnsrr_resolver_,
-        ssl_host_info_factory_,
         proxy_service_,
         socket_factory_,
         ssl_config_service_,
@@ -155,7 +147,6 @@ HttpNetworkSession* HttpNetworkLayer::GetSession() {
     // These were just temps for lazy-initializing HttpNetworkSession.
     host_resolver_ = NULL;
     dnsrr_resolver_ = NULL;
-    ssl_host_info_factory_ = NULL;
     proxy_service_ = NULL;
     socket_factory_ = NULL;
     http_auth_handler_factory_ = NULL;

net/http/http_network_layer.h

@@ -25,7 +25,6 @@ class NetLog;
 class ProxyService;
 class SpdySessionPool;
 class SSLConfigService;
-class SSLHostInfoFactory;
 
 class HttpNetworkLayer : public HttpTransactionFactory, public NonThreadSafe {
  public:
@@ -34,7 +33,6 @@ class HttpNetworkLayer : public HttpTransactionFactory, public NonThreadSafe {
   HttpNetworkLayer(ClientSocketFactory* socket_factory,
                    HostResolver* host_resolver,
                    DnsRRResolver* dnsrr_resolver,
-                   SSLHostInfoFactory* ssl_host_info_factory,
                    ProxyService* proxy_service,
                    SSLConfigService* ssl_config_service,
                    HttpAuthHandlerFactory* http_auth_handler_factory,
@@ -46,7 +44,6 @@ class HttpNetworkLayer : public HttpTransactionFactory, public NonThreadSafe {
       ClientSocketFactory* socket_factory,
       HostResolver* host_resolver,
       DnsRRResolver* dnsrr_resolver,
-      SSLHostInfoFactory* ssl_host_info_factory,
       ProxyService* proxy_service,
       SSLConfigService* ssl_config_service,
       SpdySessionPool* spdy_session_pool,
@@ -62,7 +59,6 @@ class HttpNetworkLayer : public HttpTransactionFactory, public NonThreadSafe {
   static HttpTransactionFactory* CreateFactory(
       HostResolver* host_resolver,
       DnsRRResolver* dnsrr_resolver,
-      SSLHostInfoFactory* ssl_host_info_factory,
       ProxyService* proxy_service,
       SSLConfigService* ssl_config_service,
       HttpAuthHandlerFactory* http_auth_handler_factory,
@@ -100,7 +96,6 @@ class HttpNetworkLayer : public HttpTransactionFactory, public NonThreadSafe {
   // creating |session_|.
   HostResolver* host_resolver_;
   DnsRRResolver* dnsrr_resolver_;
-  SSLHostInfoFactory* ssl_host_info_factory_;
   scoped_refptr<ProxyService> proxy_service_;
 
   // The SSL config service being used for the session.

net/http/http_network_layer_unittest.cc

@@ -25,7 +25,6 @@ TEST_F(HttpNetworkLayerTest, CreateAndDestroy) {
       NULL,
       &host_resolver,
       NULL /* dnsrr_resolver */,
-      NULL /* ssl_host_info_factory */,
       net::ProxyService::CreateDirect(),
       new net::SSLConfigServiceDefaults,
       NULL,
@@ -44,7 +43,6 @@ TEST_F(HttpNetworkLayerTest, Suspend) {
       NULL,
       &host_resolver,
       NULL /* dnsrr_resolver */,
-      NULL /* ssl_host_info_factory */,
       net::ProxyService::CreateDirect(),
       new net::SSLConfigServiceDefaults,
       NULL,
@@ -92,7 +90,6 @@ TEST_F(HttpNetworkLayerTest, GET) {
       &mock_socket_factory,
       &host_resolver,
       NULL /* dnsrr_resolver */,
-      NULL /* ssl_host_info_factory */,
       net::ProxyService::CreateDirect(),
       new net::SSLConfigServiceDefaults,
       NULL,

net/http/http_network_session.cc

@@ -21,7 +21,6 @@ namespace net {
 HttpNetworkSession::HttpNetworkSession(
     HostResolver* host_resolver,
     DnsRRResolver* dnsrr_resolver,
-    SSLHostInfoFactory* ssl_host_info_factory,
     ProxyService* proxy_service,
     ClientSocketFactory* client_socket_factory,
     SSLConfigService* ssl_config_service,
@@ -38,7 +37,6 @@ HttpNetworkSession::HttpNetworkSession(
                            client_socket_factory,
                            host_resolver,
                            dnsrr_resolver,
-                           ssl_host_info_factory,
                            proxy_service,
                            ssl_config_service),
       spdy_session_pool_(spdy_session_pool),