| 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 69f9387800dfd7acedd3eaeba6e1f85b3f8c07ec..2b7f7471b28d15f1b96e3c31595859dfb383f24a 100644
|
| --- a/chrome/browser/net/pref_proxy_config_tracker_impl.cc
|
| +++ b/chrome/browser/net/pref_proxy_config_tracker_impl.cc
|
| @@ -196,11 +196,19 @@ net::ProxyConfigService::ConfigAvailability
|
| }
|
|
|
| // static
|
| -void PrefProxyConfigTrackerImpl::RegisterPrefs(PrefService* pref_service) {
|
| +void PrefProxyConfigTrackerImpl::RegisterPrefs(
|
| + PrefServiceSimple* local_state) {
|
| + DictionaryValue* default_settings = ProxyConfigDictionary::CreateSystem();
|
| + local_state->RegisterDictionaryPref(prefs::kProxy, default_settings);
|
| +}
|
| +
|
| +// static
|
| +void PrefProxyConfigTrackerImpl::RegisterUserPrefs(
|
| + PrefServiceSyncable* pref_service) {
|
| DictionaryValue* default_settings = ProxyConfigDictionary::CreateSystem();
|
| pref_service->RegisterDictionaryPref(prefs::kProxy,
|
| default_settings,
|
| - PrefService::UNSYNCABLE_PREF);
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| }
|
|
|
| ProxyPrefs::ConfigState PrefProxyConfigTrackerImpl::GetProxyConfig(
|
|
|