Changed the jingle network code in ChromeAsyncSocket to use the client socket pool. This also all...

jingle/notifier/base/xmpp_client_socket_factory.h

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.

[akalin, 2011/04/14 21:54:50]

I notice that this file is still listed as 'D' from the index.  Is that because
it was originally deleted?  It seems to work, just wondering if it's a harmless
error.

[sanjeevr, 2011/04/14 23:15:43]

Yeah I noticed that too, was not sure why. My svn diff shows it correctly as M.

+// Copyright (c) 2011 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 JINGLE_NOTIFIER_BASE_XMPP_CLIENT_SOCKET_FACTORY_H_
 #define JINGLE_NOTIFIER_BASE_XMPP_CLIENT_SOCKET_FACTORY_H_
 
 #include <string>
 
-#include "net/socket/client_socket_factory.h"
+#include "base/memory/ref_counted.h"
+#include "net/base/ssl_config_service.h"
 
 namespace net {
-class DnsCertProvenanceChecker;
+class ClientSocket;
+class ClientSocketFactory;
+class ClientSocketHandle;
 class HostPortPair;
+class NetLog;
+class SSLClientSocket;
 class SSLHostInfo;
+class URLRequestContextGetter;
 }
 
 namespace notifier {
 
-class XmppClientSocketFactory : public net::ClientSocketFactory {
+class XmppClientSocketFactory {
  public:
   // Does not take ownership of |client_socket_factory|.
   XmppClientSocketFactory(
       net::ClientSocketFactory* client_socket_factory,
+      const net::SSLConfig& ssl_config,
+      const scoped_refptr<net::URLRequestContextGetter>& request_context_getter,
       bool use_fake_ssl_client_socket);
 
+#if defined(UNIT_TEST)

[akalin, 2011/04/14 21:54:50]

Instead of doing this, can you create an interface (say,
ResolvingClientSocketFactory) and make this class and the mock class inherit
from it?

[sanjeevr, 2011/04/14 23:15:43]

Done.

+  XmppClientSocketFactory() : client_socket_factory_(NULL),
+                              use_fake_ssl_client_socket_(false) { }
+#endif  // #if defined(UNIT_TEST)
+
   virtual ~XmppClientSocketFactory();
 
-  // net::ClientSocketFactory implementation.
+  // Method to create a transport socket using a HostPortPair.
   virtual net::ClientSocket* CreateTransportClientSocket(
-      const net::AddressList& addresses, net::NetLog* net_log,
-      const net::NetLog::Source& source);
+      const net::HostPortPair& host_and_port, net::NetLog* net_log);
+
   virtual net::SSLClientSocket* CreateSSLClientSocket(
       net::ClientSocketHandle* transport_socket,
-      const net::HostPortPair& host_and_port, const net::SSLConfig& ssl_config,
-      net::SSLHostInfo* ssl_host_info, net::CertVerifier* cert_verifier,
-      net::DnsCertProvenanceChecker* dns_cert_checker);
-  virtual void ClearSSLSessionCache();
+      const net::HostPortPair& host_and_port);
 
  private:
   net::ClientSocketFactory* const client_socket_factory_;
+  scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
+  const net::SSLConfig ssl_config_;
   const bool use_fake_ssl_client_socket_;
 
   DISALLOW_COPY_AND_ASSIGN(XmppClientSocketFactory);
 };
 
 }  // namespace notifier
 
 #endif  // JINGLE_NOTIFIER_BASE_XMPP_CLIENT_SOCKET_FACTORY_H_