Fix proxy settings so that a port number in the host field gets applied to the port field.

chrome/browser/chromeos/proxy_cros_settings_parser.cc

Index: chrome/browser/chromeos/proxy_cros_settings_parser.cc
diff --git a/chrome/browser/chromeos/proxy_cros_settings_parser.cc b/chrome/browser/chromeos/proxy_cros_settings_parser.cc
index 5dc5e270340f4067c899d0ff9744933216606ce6..e902a5e0738f0bc3882ca7adc816b8ead8f9bde1 100644
--- a/chrome/browser/chromeos/proxy_cros_settings_parser.cc
+++ b/chrome/browser/chromeos/proxy_cros_settings_parser.cc
@@ -82,10 +82,7 @@ net::ProxyServer CreateProxyServer(std::string host,
     host_port_pair = net::HostPortPair::FromString(host);
   if (host_port_pair.host().empty())  // Host is not URL or <server>::<port>.
     host_port_pair = net::HostPortPair(host, port);
-  // Formal parameter port overrides what may have been specified in host.
-  if (port != 0 && port != default_port)
-    host_port_pair.set_port(port);
-  else if (host_port_pair.port() == 0)  // No port in host, use default.
+  if (host_port_pair.port() == 0)  // No port in host, use default.
     host_port_pair.set_port(default_port);
   return net::ProxyServer(scheme, host_port_pair);
 }