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

BUG=chromium-os:21435
TEST=verify per bug rpt.

Review URL: http://codereview.chromium.org/8496017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109100 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/proxy_cros_settings_provider.cc

@@ -351,12 +351,7 @@ net::ProxyServer ProxyCrosSettingsProvider::CreateProxyServerFromHost(
   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(
@@ -366,8 +361,17 @@ net::ProxyServer ProxyCrosSettingsProvider::CreateProxyServerFromPort(
   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);
 }

chrome/browser/chromeos/proxy_cros_settings_provider.h

@@ -46,6 +46,11 @@ class ProxyCrosSettingsProvider : public CrosSettingsProvider {
       const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy,
       net::ProxyServer::Scheme scheme) const;
 
+  net::ProxyServer CreateProxyServer(
+      std::string host,
+      uint16 port,
+      net::ProxyServer::Scheme scheme) const;
+
   Value* CreateServerHostValue(
       const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy) const;