| Index: net/proxy/proxy_config_service_linux.cc
|
| diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc
|
| index 4bbe0cb575b8f281399d6307d49bb3364b30b9b7..cb3ddead4c66c03d8bca585d2a36849aa4b0f50d 100644
|
| --- a/net/proxy/proxy_config_service_linux.cc
|
| +++ b/net/proxy/proxy_config_service_linux.cc
|
| @@ -1215,8 +1215,8 @@ class SettingGetterImplKDE : public ProxyConfigServiceLinux::SettingGetter,
|
| *(split++) = 0;
|
| std::string key = line;
|
| std::string value = split;
|
| - TrimWhitespaceASCII(key, TRIM_ALL, &key);
|
| - TrimWhitespaceASCII(value, TRIM_ALL, &value);
|
| + base::TrimWhitespaceASCII(key, base::TRIM_ALL, &key);
|
| + base::TrimWhitespaceASCII(value, base::TRIM_ALL, &value);
|
| // Skip this line if the key name is empty.
|
| if (key.empty())
|
| continue;
|
| @@ -1230,7 +1230,7 @@ class SettingGetterImplKDE : public ProxyConfigServiceLinux::SettingGetter,
|
| // Trim the localization indicator off.
|
| key.resize(length);
|
| // Remove any resulting trailing whitespace.
|
| - TrimWhitespaceASCII(key, TRIM_TRAILING, &key);
|
| + base::TrimWhitespaceASCII(key, base::TRIM_TRAILING, &key);
|
| // Skip this line if the key name is now empty.
|
| if (key.empty())
|
| continue;
|
|
|