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

 // 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 "chrome/browser/chromeos/proxy_cros_settings_parser.h"
 
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 64 matching lines @@
   uint16 default_port = net::ProxyServer::GetDefaultPortForScheme(scheme);
   net::HostPortPair host_port_pair;
   // Check if host is a valid URL or a string of valid format <server>::<port>.
   GURL url(host);
   if (url.is_valid())  // See if host is URL.
     host_port_pair = net::HostPortPair::FromURL(url);
   if (host_port_pair.host().empty())  // See if host is <server>::<port>.
     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);
 }
 
 net::ProxyServer CreateProxyServerFromHost(
     const std::string& host,
     const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy,
     net::ProxyServer::Scheme scheme) {
   uint16 port = 0;
   if (proxy.server.is_valid())
@@ skipping 276 matching lines @@
   } else {
     dict->SetBoolean("disabled", false);
   }
   *out_value = dict;
   return true;
 }
 
 }  // namespace proxy_cros_settings_parser
 
 }  // namespace chromeos