Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(502)

Unified Diff: jingle/notifier/base/proxy_resolving_client_socket.cc

Issue 10389098: [Sync] Make ChromeAsyncSocket use only the hostname on connect (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: jingle/notifier/base/proxy_resolving_client_socket.cc
diff --git a/jingle/notifier/base/proxy_resolving_client_socket.cc b/jingle/notifier/base/proxy_resolving_client_socket.cc
index ab89ffbd81f9e9de0bb5d60ad82a71c6ff8f6dff..3c3d082c63ffe3642da69d48af80531ba610517a 100644
--- a/jingle/notifier/base/proxy_resolving_client_socket.cc
+++ b/jingle/notifier/base/proxy_resolving_client_socket.cc
@@ -44,6 +44,8 @@ ProxyResolvingClientSocket::ProxyResolvingClientSocket(
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();
@@ -108,6 +110,7 @@ int ProxyResolvingClientSocket::Connect(
// 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_,
« no previous file with comments | « jingle/notifier/base/proxy_resolving_client_socket.h ('k') | jingle/notifier/base/xmpp_client_socket_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698