diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-02 21:49:40 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-02 21:49:40 +0000 |
| commit | fae7669f438f42169f9da35406d9b4cef6b541fd (patch) | |
| tree | 3b13582d0f9ed536194e9fc36818ebf1b31b8639 /chrome/browser/importer | |
| parent | abd701d7cd8b601b5f13c6ff2d56eccf9f22fa64 (diff) | |
| download | chromium_src-fae7669f438f42169f9da35406d9b4cef6b541fd.zip chromium_src-fae7669f438f42169f9da35406d9b4cef6b541fd.tar.gz chromium_src-fae7669f438f42169f9da35406d9b4cef6b541fd.tar.bz2 | |
Address a TODO: use HostPortPair rather than a naked host string.
Review URL: http://codereview.chromium.org/3047033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54613 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer')
| -rw-r--r-- | chrome/browser/importer/firefox_proxy_settings.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/chrome/browser/importer/firefox_proxy_settings.cc b/chrome/browser/importer/firefox_proxy_settings.cc index 0f8ff39..9c3166b 100644 --- a/chrome/browser/importer/firefox_proxy_settings.cc +++ b/chrome/browser/importer/firefox_proxy_settings.cc @@ -127,22 +127,19 @@ bool FirefoxProxySettings::ToProxyConfig(net::ProxyConfig* config) { if (!http_proxy().empty()) { config->proxy_rules().proxy_for_http = net::ProxyServer( net::ProxyServer::SCHEME_HTTP, - http_proxy(), - http_proxy_port()); + net::HostPortPair(http_proxy(), http_proxy_port())); } if (!ftp_proxy().empty()) { config->proxy_rules().proxy_for_ftp = net::ProxyServer( net::ProxyServer::SCHEME_HTTP, - ftp_proxy(), - ftp_proxy_port()); + net::HostPortPair(ftp_proxy(), ftp_proxy_port())); } if (!ssl_proxy().empty()) { config->proxy_rules().proxy_for_https = net::ProxyServer( net::ProxyServer::SCHEME_HTTP, - ssl_proxy(), - ssl_proxy_port()); + net::HostPortPair(ssl_proxy(), ssl_proxy_port())); } if (!socks_host().empty()) { @@ -151,8 +148,7 @@ bool FirefoxProxySettings::ToProxyConfig(net::ProxyConfig* config) { config->proxy_rules().socks_proxy = net::ProxyServer( proxy_scheme, - socks_host(), - socks_port()); + net::HostPortPair(socks_host(), socks_port())); } config->proxy_rules().bypass_rules.ParseFromStringUsingSuffixMatching( |