cros proxy: fix bug to use default port whenever its input field is empty.

chrome/browser/chromeos/proxy_cros_settings_provider.cc

 // Copyright (c) 2011 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_provider.h"
 
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros_settings.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 333 matching lines @@
   return profile_->GetProxyConfigTracker();
 }
 
 net::ProxyServer ProxyCrosSettingsProvider::CreateProxyServerFromHost(
     const std::string& host,
     const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy,
     net::ProxyServer::Scheme scheme) const {
   uint16 port = 0;
   if (proxy.server.is_valid())
     port = proxy.server.host_port_pair().port();
-  if (host.length() == 0 && port == 0)
-    return net::ProxyServer();
-  if (port == 0)
-    port = net::ProxyServer::GetDefaultPortForScheme(scheme);
-  net::HostPortPair host_port_pair(host, port);
-  return net::ProxyServer(scheme, host_port_pair);
+  return CreateProxyServer(host, port, scheme);
 }
 
 net::ProxyServer ProxyCrosSettingsProvider::CreateProxyServerFromPort(
     uint16 port,
     const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy,
     net::ProxyServer::Scheme scheme) const {
   std::string host;
   if (proxy.server.is_valid())
     host = proxy.server.host_port_pair().host();
+  return CreateProxyServer(host, port, scheme);
+}
+
+net::ProxyServer ProxyCrosSettingsProvider::CreateProxyServer(
+    std::string host,
+    uint16 port,
+    net::ProxyServer::Scheme scheme) const {
   if (host.length() == 0 && port == 0)
     return net::ProxyServer();
+  if (port == 0)
+    port = net::ProxyServer::GetDefaultPortForScheme(scheme);
   net::HostPortPair host_port_pair(host, port);
   return net::ProxyServer(scheme, host_port_pair);
 }
 
 Value* ProxyCrosSettingsProvider::CreateServerHostValue(
     const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy) const {
   return proxy.server.is_valid() ?
          Value::CreateStringValue(proxy.server.host_port_pair().host()) :
          NULL;
 }
 
 Value* ProxyCrosSettingsProvider::CreateServerPortValue(
     const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy) const {
   return proxy.server.is_valid() ?
          Value::CreateIntegerValue(proxy.server.host_port_pair().port()) :
          NULL;
 }
 
 }  // namespace chromeos