| Index: chrome/browser/net/pref_proxy_config_tracker_impl.cc
|
| diff --git a/chrome/browser/net/pref_proxy_config_tracker_impl.cc b/chrome/browser/net/pref_proxy_config_tracker_impl.cc
|
| index d596213888fae57d995698e6d3e278e1cd6a3f03..cac182e649b8ba89ca3f1dd1ad02b47b8159eec4 100644
|
| --- a/chrome/browser/net/pref_proxy_config_tracker_impl.cc
|
| +++ b/chrome/browser/net/pref_proxy_config_tracker_impl.cc
|
| @@ -204,11 +204,12 @@ void PrefProxyConfigTrackerImpl::RegisterPrefs(PrefRegistrySimple* registry) {
|
|
|
| // static
|
| void PrefProxyConfigTrackerImpl::RegisterUserPrefs(
|
| - PrefRegistrySyncable* pref_service) {
|
| + user_prefs::PrefRegistrySyncable* pref_service) {
|
| DictionaryValue* default_settings = ProxyConfigDictionary::CreateSystem();
|
| - pref_service->RegisterDictionaryPref(prefs::kProxy,
|
| - default_settings,
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + pref_service->RegisterDictionaryPref(
|
| + prefs::kProxy,
|
| + default_settings,
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| }
|
|
|
| ProxyPrefs::ConfigState PrefProxyConfigTrackerImpl::GetProxyConfig(
|
|
|