[Sync] Make ChromeAsyncSocket use only the hostname on connect

jingle/notifier/base/chrome_async_socket.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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
@@ skipping 15 matching lines @@
 class IOBufferWithSize;
 class StreamSocket;
 }  // namespace net
 
 namespace notifier {
 
 class ResolvingClientSocketFactory;
 
 class ChromeAsyncSocket : public buzz::AsyncSocket {
  public:
-  // Takes ownership of |client_socket_factory|.
-  ChromeAsyncSocket(ResolvingClientSocketFactory* client_socket_factory,
-                    size_t read_buf_size,
-                    size_t write_buf_size);
+  // Takes ownership of |resolving_client_socket_factory|.
+  ChromeAsyncSocket(
+      ResolvingClientSocketFactory* resolving_client_socket_factory,
+      size_t read_buf_size,
+      size_t write_buf_size);
 
   // 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() OVERRIDE;
 
   // 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() OVERRIDE;
 
   // GetError() (which is of type net::Error) != net::OK only when
   // error() == ERROR_WINSOCK.
   virtual int GetError() OVERRIDE;
 
   // 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.
+  // If |address| has an empty hostname or a zero port, sets error to
+  // ERROR_DNS and returns false.  (We don't use the IP address even
+  // if it's present, as DNS resolution is done by
+  // |resolving_client_socket_factory_|.  But it's perfectly fine if
+  // the hostname is a stringified IP address.)
   //
   // Otherwise, starts the connection process and returns true.
   // 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) OVERRIDE;
 
   // 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.
@@ skipping 92 matching lines @@
   void PostDoWrite();
   void DoWrite();
   void ProcessWriteDone(int status);
 
   // SSL/TLS connection functions.
   void ProcessSSLConnectDone(int status);
 
   // Close functions.
   void DoClose();
 
-  scoped_ptr<ResolvingClientSocketFactory> client_socket_factory_;
+  base::WeakPtrFactory<ChromeAsyncSocket> weak_ptr_factory_;
+  scoped_ptr<ResolvingClientSocketFactory> resolving_client_socket_factory_;
 
   // buzz::AsyncSocket state.
   buzz::AsyncSocket::State state_;
   buzz::AsyncSocket::Error error_;
   net::Error net_error_;
 
-  // Used by read/write loops.
-  base::WeakPtrFactory<ChromeAsyncSocket> weak_factory_;
-
   // NULL iff state() == STATE_CLOSED.
-  //
-  // TODO(akalin): Use ClientSocketPool.
   scoped_ptr<net::StreamSocket> transport_socket_;
 
   // 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_