Proxy settings automation hooks and related proxy settings fixes.

chrome/browser/chromeos/proxy_cros_settings_provider.h

Index: chrome/browser/chromeos/proxy_cros_settings_provider.h
diff --git a/chrome/browser/chromeos/proxy_cros_settings_provider.h b/chrome/browser/chromeos/proxy_cros_settings_provider.h
index 12e5d80cedd9e45ccd3d815dedd3059f53d68120..da523647f959dd1ee1def7a27520c4ac9fc14020 100644
--- a/chrome/browser/chromeos/proxy_cros_settings_provider.h
+++ b/chrome/browser/chromeos/proxy_cros_settings_provider.h
@@ -26,10 +26,15 @@ class ProxyCrosSettingsProvider : public CrosSettingsProvider {
 
   chromeos::ProxyConfigServiceImpl* GetConfigService() const;
 
-  void AppendPortIfValid(const char* port_cache_key, std::string* server_uri);
-
-  void FormServerUriIfValid(const char* host_cache_key,
-      const std::string& port_num, std::string* server_uri);
+  net::ProxyServer CreateProxyServerFromHost(
+      const std::string& host,
+      const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy,
+      net::ProxyServer::Scheme scheme) const;
+
+  net::ProxyServer CreateProxyServerFromPort(
+      uint16 port,
+      const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy,
+      net::ProxyServer::Scheme scheme) const;
 
   Value* CreateServerHostValue(
       const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy) const;