| Index: chrome/browser/net/firefox_proxy_settings.cc
|
| diff --git a/chrome/browser/net/firefox_proxy_settings.cc b/chrome/browser/net/firefox_proxy_settings.cc
|
| index 9df1dda5badb2132088995608eb5b679d858f2f0..2ac04383badc657b42853fd26ee94f33448cfebe 100644
|
| --- a/chrome/browser/net/firefox_proxy_settings.cc
|
| +++ b/chrome/browser/net/firefox_proxy_settings.cc
|
| @@ -65,7 +65,8 @@ FirefoxProxySettings::SOCKSVersion IntToSOCKSVersion(int type) {
|
| // |prefs| is not filled).
|
| // Note: for strings, only valid UTF-8 string values are supported. If a
|
| // key/pair is not valid UTF-8, it is ignored and will not appear in |prefs|.
|
| -bool ParsePrefFile(const base::FilePath& pref_file, DictionaryValue* prefs) {
|
| +bool ParsePrefFile(const base::FilePath& pref_file,
|
| + base::DictionaryValue* prefs) {
|
| // The string that is before a pref key.
|
| const std::string kUserPrefString = "user_pref(\"";
|
| std::string contents;
|
| @@ -245,7 +246,7 @@ bool FirefoxProxySettings::ToProxyConfig(net::ProxyConfig* config) {
|
| // static
|
| bool FirefoxProxySettings::GetSettingsFromFile(const base::FilePath& pref_file,
|
| FirefoxProxySettings* settings) {
|
| - DictionaryValue dictionary;
|
| + base::DictionaryValue dictionary;
|
| if (!ParsePrefFile(pref_file, &dictionary))
|
| return false;
|
|
|
|
|