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

jingle/notifier/base/chrome_async_socket.h

 // 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.
 //
 // An implementation of buzz::AsyncSocket that uses Chrome sockets.
 
 #ifndef JINGLE_NOTIFIER_BASE_CHROME_ASYNC_SOCKET_H_
 #define JINGLE_NOTIFIER_BASE_CHROME_ASYNC_SOCKET_H_
 
 #if !defined(FEATURE_ENABLE_SSL)
 #error ChromeAsyncSocket expects FEATURE_ENABLE_SSL to be defined
 #endif
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/task.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
-#include "net/base/ssl_config_service.h"
 #include "talk/xmpp/asyncsocket.h"
 
 namespace net {
-class CertVerifier;
 class ClientSocket;
-class ClientSocketFactory;
 class IOBufferWithSize;
 }  // namespace net
 
 namespace notifier {
 
+class ResolvingClientSocketFactory;
+
 class ChromeAsyncSocket : public buzz::AsyncSocket {
  public:
-  // Takes ownership of |client_socket_factory| but not |cert_verifier| nor
-  // |net_log|.  |cert_verifier| may not be NULL.  |net_log| may be NULL.
-  ChromeAsyncSocket(net::ClientSocketFactory* client_socket_factory,
-                    const net::SSLConfig& ssl_config,
-                    net::CertVerifier* cert_verifier,
+  // Takes ownership of |client_socket_factory| but not |net_log|.
+  // |net_log| may be NULL.
+  ChromeAsyncSocket(ResolvingClientSocketFactory* client_socket_factory,
                     size_t read_buf_size,
                     size_t write_buf_size,
                     net::NetLog* net_log);
 
   // Does not raise any signals.
   virtual ~ChromeAsyncSocket();
 
   // buzz::AsyncSocket implementation.
 
   // The current state (see buzz::AsyncSocket::State; all but
@@ skipping 127 matching lines @@
 
   // Close functions.
   void DoClose();
 
   // Callbacks passed to |transport_socket_|.
   net::CompletionCallbackImpl<ChromeAsyncSocket> connect_callback_;
   net::CompletionCallbackImpl<ChromeAsyncSocket> read_callback_;
   net::CompletionCallbackImpl<ChromeAsyncSocket> write_callback_;
   net::CompletionCallbackImpl<ChromeAsyncSocket> ssl_connect_callback_;
 
-  scoped_ptr<net::ClientSocketFactory> client_socket_factory_;
-  const net::SSLConfig ssl_config_;
-  net::CertVerifier* const cert_verifier_;
+  scoped_ptr<ResolvingClientSocketFactory> client_socket_factory_;
   net::BoundNetLog bound_net_log_;
 
   // buzz::AsyncSocket state.
   buzz::AsyncSocket::State state_;
   buzz::AsyncSocket::Error error_;
   net::Error net_error_;
 
   // Used by read/write loops.
   ScopedRunnableMethodFactory<ChromeAsyncSocket>
       scoped_runnable_method_factory_;
@@ skipping 16 matching lines @@
   AsyncIOState write_state_;
   scoped_refptr<net::IOBufferWithSize> write_buf_;
   size_t write_end_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeAsyncSocket);
 };
 
 }  // namespace notifier
 
 #endif  // JINGLE_NOTIFIER_BASE_CHROME_ASYNC_SOCKET_H_