Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / net / proxy / proxy_server.cc

diff --git a/src/net/proxy/proxy_server.cc b/src/net/proxy/proxy_server.cc
index 09c2538..0b9ba67 100644 (file)
--- a/src/net/proxy/proxy_server.cc
+++ b/src/net/proxy/proxy_server.cc
@@ -64,14 +64,6 @@ ProxyServer::Scheme GetSchemeFromURIInternal(std::string::const_iterator begin,
   return ProxyServer::SCHEME_INVALID;
 }
 
-std::string HostNoBrackets(const std::string& host) {
-  // Remove brackets from an RFC 2732-style IPv6 literal address.
-  const std::string::size_type len = host.size();
-  if (len >= 2 && host[0] == '[' && host[len - 1] == ']')
-    return host.substr(1, len - 2);
-  return host;
-}
-
 }  // namespace
 
 ProxyServer::ProxyServer(Scheme scheme, const HostPortPair& host_port_pair)
@@ -88,7 +80,8 @@ ProxyServer::ProxyServer(Scheme scheme, const HostPortPair& host_port_pair)
 const HostPortPair& ProxyServer::host_port_pair() const {
   // Doesn't make sense to call this if the URI scheme doesn't
   // have concept of a host.
-  DCHECK(is_valid() && !is_direct());
+  DCHECK(is_valid());
+  DCHECK(!is_direct());
   return host_port_pair_;
 }
 
@@ -245,7 +238,7 @@ ProxyServer ProxyServer::FromSchemeHostAndPort(
     if (port == -1)
       port = GetDefaultPortForScheme(scheme);
 
-    host_port_pair = HostPortPair(HostNoBrackets(host), port);
+    host_port_pair = HostPortPair(host, port);
   }
 
   return ProxyServer(scheme, host_port_pair);