Index: chrome/browser/profiles/profile_impl.cc |
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc |
index 5c7e003eb75dda013aa1206e3083b2028a489608..930c40b3d46a32709e5a1453efc44fe4814cdf8d 100644 |
--- a/chrome/browser/profiles/profile_impl.cc |
+++ b/chrome/browser/profiles/profile_impl.cc |
@@ -1478,11 +1478,11 @@ void ProfileImpl::ChangeAppLocale( |
chromeos::ProxyConfigServiceImpl* |
ProfileImpl::GetChromeOSProxyConfigServiceImpl() { |
- if (!chromeos_proxy_config_service_impl_) { |
- chromeos_proxy_config_service_impl_ = |
- new chromeos::ProxyConfigServiceImpl(); |
+ if (!chromeos_proxy_config_service_impl_.get()) { |
+ chromeos_proxy_config_service_impl_.reset( |
+ new chromeos::ProxyConfigServiceImpl(g_browser_process->local_state())); |
} |
- return chromeos_proxy_config_service_impl_; |
+ return chromeos_proxy_config_service_impl_.get(); |
} |
void ProfileImpl::SetupChromeOSEnterpriseExtensionObserver() { |
@@ -1498,8 +1498,11 @@ void ProfileImpl::InitChromeOSPreferences() { |
#endif // defined(OS_CHROMEOS) |
PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() { |
- if (!pref_proxy_config_tracker_) |
- pref_proxy_config_tracker_ = new PrefProxyConfigTracker(GetPrefs()); |
+ if (!pref_proxy_config_tracker_) { |
+ pref_proxy_config_tracker_ = |
+ new PrefProxyConfigTracker(GetPrefs(), |
+ g_browser_process->local_state()); |
+ } |
return pref_proxy_config_tracker_; |
} |