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/host_port_pair.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
 #include "net/base/ssl_config_service.h"
+#include "net/proxy/proxy_info.h"
+#include "net/proxy/proxy_service.h"
 #include "talk/xmpp/asyncsocket.h"
 
 namespace net {
-class CertVerifier;
 class ClientSocket;
+class ClientSocketHandle;
 class ClientSocketFactory;
+class HttpNetworkSession;
 class IOBufferWithSize;
+class URLRequestContextGetter;
 }  // namespace net
 
 namespace notifier {
 
 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,
+  // Does not take ownership of |net_log|. |net_log| may be NULL.
+  // The transport socket is created from the client socket pool.
+  ChromeAsyncSocket(const net::SSLConfig& ssl_config,
+                    const scoped_refptr<net::URLRequestContextGetter>&
+                        request_context_getter,
+                    bool use_fake_ssl_client_socket,
                     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
   // STATE_CLOSING is used).
   virtual State state();
 
   // The last generated error.  Errors are generated when the main
   // functions below return false or when SignalClosed is raised due
   // to an asynchronous error.
   virtual Error error();
 
   // GetError() (which is of type net::Error) != net::OK only when
   // error() == ERROR_WINSOCK.
   virtual int GetError();
 
   // Tries to connect to the given address.
   //
   // If state() is not STATE_CLOSED, sets error to ERROR_WRONGSTATE
   // and returns false.
   //
-  // If |address| is not resolved, sets error to ERROR_DNS and returns
-  // false.
   //
-  // Otherwise, starts the connection process and returns true.
+  // Otherwise, starts the connection process and returns true. The connection
+  // process involves resolving proxy servers to use for the connection and
+  // then connecting using the client socket pool.
   // SignalConnected will be raised when the connection is successful;
   // otherwise, SignalClosed will be raised with a net error set.
   virtual bool Connect(const talk_base::SocketAddress& address);
 
   // Tries to read at most |len| bytes into |data|.
   //
   // If state() is not STATE_TLS_CONNECTING, STATE_OPEN, or
   // STATE_TLS_OPEN, sets error to ERROR_WRONGSTATE and returns false.
   //
   // Otherwise, fills in |len_read| with the number of bytes read and
@@ skipping 54 matching lines @@
   // SignalClosed: raised whenever the socket is closed, either due to
   // an asynchronous error, the other side closing the connection, or
   // when Close() is called.
   //
   // SignalRead: raised whenever the next call to Read() will succeed
   // with a non-zero |len_read| (assuming nothing else happens in the
   // meantime).
   //
   // SignalError: not used.
 
+#if defined(UNIT_TEST)
+  // Used to override the socket used in unit-tests. Takes ownership of
+  // |client_socket_factory|.
+  void set_client_socket_factory(
+      net::ClientSocketFactory* client_socket_factory) {
+    client_socket_factory_.reset(client_socket_factory);
+  }
+#endif  // defined(UNIT_TEST)
+
  private:
   enum AsyncIOState {
     // An I/O op is not in progress.
     IDLE,
     // A function has been posted to do the I/O.
     POSTED,
     // An async I/O operation is pending.
     PENDING,
   };
 
+  // A version of Connect that uses the passed in ClientSocketFactory to
+  // create a connection rather than use the client socket pool. Used for
+  // unit-tests.
+  bool ConnectUsingFactory(const talk_base::SocketAddress& address);
+
   bool IsOpen() const;
 
   // Error functions.
   void DoNonNetError(Error error);
   void DoNetError(net::Error net_error);
   void DoNetErrorFromStatus(int status);
 
-  // Connection functions.
+  // Proxy resolution and connection functions.
+  void ProcessProxyResolveDone(int status);
+  int ReconsiderProxyAfterError(int error);
   void ProcessConnectDone(int status);
+  void ProcessFakeSSLHandshakeDone(int status);
 
   // Read loop functions.
   void PostDoRead();
   void DoRead();
   void ProcessReadDone(int status);
 
   // Write loop functions.
   void PostDoWrite();
   void DoWrite();
   void ProcessWriteDone(int status);
 
   // SSL/TLS connection functions.
   void ProcessSSLConnectDone(int status);
 
   // Close functions.
   void DoClose();
 
-  // Callbacks passed to |transport_socket_|.
+  // Callbacks passed to net APIs.
+  net::CompletionCallbackImpl<ChromeAsyncSocket> proxy_resolve_callback_;
   net::CompletionCallbackImpl<ChromeAsyncSocket> connect_callback_;
   net::CompletionCallbackImpl<ChromeAsyncSocket> read_callback_;
   net::CompletionCallbackImpl<ChromeAsyncSocket> write_callback_;
   net::CompletionCallbackImpl<ChromeAsyncSocket> ssl_connect_callback_;
+  net::CompletionCallbackImpl<ChromeAsyncSocket> fake_ssl_handshake_callback_;
 
+  // Used for unit-tests.
   scoped_ptr<net::ClientSocketFactory> client_socket_factory_;
   const net::SSLConfig ssl_config_;
-  net::CertVerifier* const cert_verifier_;
+  scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
+  bool use_fake_ssl_client_socket_;
   net::BoundNetLog bound_net_log_;
+  scoped_refptr<net::HttpNetworkSession> network_session_;
 
   // 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_;
 
   // NULL iff state() == STATE_CLOSED.
   //
-  // TODO(akalin): Use ClientSocketPool.
-  scoped_ptr<net::ClientSocket> transport_socket_;
+  // The transport socket.
+  scoped_ptr<net::ClientSocketHandle> connection_;
+  net::ProxyService::PacRequest* pac_request_;
+  net::ProxyInfo proxy_info_;
+  net::HostPortPair dest_host_port_pair_;
+  bool tried_direct_connect_fallback_;
 
   // State for the read loop.  |read_start_| <= |read_end_| <=
   // |read_buf_->size()|.  There's a read in flight (i.e.,
   // |read_state_| != IDLE) iff |read_end_| == 0.
   AsyncIOState read_state_;
   scoped_refptr<net::IOBufferWithSize> read_buf_;
   size_t read_start_, read_end_;
 
   // State for the write loop.  |write_end_| <= |write_buf_->size()|.
   // There's a write in flight (i.e., |write_state_| != IDLE) iff
   // |write_end_| > 0.
   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_