[Sync] Make ChromeAsyncSocket use only the hostname on connect

jingle/notifier/base/proxy_resolving_client_socket.cc

 // 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.
 
 #include "jingle/notifier/base/proxy_resolving_client_socket.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
@@ skipping 26 matching lines @@
           tried_direct_connect_fallback_(false),
           bound_net_log_(
               net::BoundNetLog::Make(
                   request_context_getter->GetURLRequestContext()->net_log(),
                   net::NetLog::SOURCE_SOCKET)),
           ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   DCHECK(request_context_getter);
   net::URLRequestContext* request_context =
       request_context_getter->GetURLRequestContext();
   DCHECK(request_context);
+  DCHECK(!dest_host_port_pair_.host().empty());
+  DCHECK_GT(dest_host_port_pair_.port(), 0);
   net::HttpNetworkSession::Params session_params;
   session_params.client_socket_factory = socket_factory;
   session_params.host_resolver = request_context->host_resolver();
   session_params.cert_verifier = request_context->cert_verifier();
   // TODO(rkn): This is NULL because ServerBoundCertService is not thread safe.
   session_params.server_bound_cert_service = NULL;
   // transport_security_state is NULL because it's not thread safe.
   session_params.transport_security_state = NULL;
   session_params.proxy_service = request_context->proxy_service();
   session_params.ssl_host_info_factory = NULL;
@@ skipping 44 matching lines @@
 }
 
 int ProxyResolvingClientSocket::Connect(
     const net::CompletionCallback& callback) {
   DCHECK(user_connect_callback_.is_null());
 
   tried_direct_connect_fallback_ = false;
 
   // First we try and resolve the proxy.
   GURL url("http://" + dest_host_port_pair_.ToString());
+  DCHECK(url.is_valid());
   int status = network_session_->proxy_service()->ResolveProxy(
       url,
       &proxy_info_,
       proxy_resolve_callback_,
       &pac_request_,
       bound_net_log_);
   if (status != net::ERR_IO_PENDING) {
     // We defer execution of ProcessProxyResolveDone instead of calling it
     // directly here for simplicity. From the caller's point of view,
     // the connect always happens asynchronously.
@@ skipping 252 matching lines @@
   return net::kProtoUnknown;
 }
 
 void ProxyResolvingClientSocket::CloseTransportSocket() {
   if (transport_.get() && transport_->socket())
     transport_->socket()->Disconnect();
   transport_.reset();
 }
 
 }  // namespace notifier