| Index: chrome/browser/chromeos/proxy_config_service_impl.cc
|
| diff --git a/chrome/browser/chromeos/proxy_config_service_impl.cc b/chrome/browser/chromeos/proxy_config_service_impl.cc
|
| index 74617adb14816e04d42ce09b52efbdd1b503feb9..6ffb8f79ea8cefd15377dbda0e128e4bd044c4e8 100644
|
| --- a/chrome/browser/chromeos/proxy_config_service_impl.cc
|
| +++ b/chrome/browser/chromeos/proxy_config_service_impl.cc
|
| @@ -363,7 +363,7 @@ bool ProxyConfigServiceImpl::ProxyConfig::SerializeForNetwork(
|
|
|
| // static
|
| void ProxyConfigServiceImpl::ProxyConfig::EncodeAndAppendProxyServer(
|
| - const std::string& scheme,
|
| + const std::string& url_scheme,
|
| const net::ProxyServer& server,
|
| std::string* spec) {
|
| if (!server.is_valid())
|
| @@ -372,8 +372,8 @@ void ProxyConfigServiceImpl::ProxyConfig::EncodeAndAppendProxyServer(
|
| if (!spec->empty())
|
| *spec += ';';
|
|
|
| - if (!scheme.empty()) {
|
| - *spec += scheme;
|
| + if (!url_scheme.empty()) {
|
| + *spec += url_scheme;
|
| *spec += "=";
|
| }
|
| *spec += server.ToURI();
|
|
|