diff options
Diffstat (limited to 'chrome/browser/profiles/profile_impl.cc')
| -rw-r--r-- | chrome/browser/profiles/profile_impl.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index aa2d69a..673a36c 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -54,7 +54,7 @@ #include "chrome/browser/net/gaia/token_service.h" #include "chrome/browser/net/net_pref_observer.h" #include "chrome/browser/net/predictor.h" -#include "chrome/browser/net/pref_proxy_config_service.h" +#include "chrome/browser/net/proxy_service_factory.h" #include "chrome/browser/net/ssl_config_service_manager.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/password_manager/password_store_default.h" @@ -136,6 +136,7 @@ #include "chrome/browser/chromeos/locale_change_guard.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/preferences.h" +#include "chrome/browser/chromeos/proxy_config_service_impl.h" #endif using base::Time; @@ -608,7 +609,7 @@ ProfileImpl::~ProfileImpl() { if (extension_message_service_) extension_message_service_->DestroyingProfile(); - if (pref_proxy_config_tracker_) + if (pref_proxy_config_tracker_.get()) pref_proxy_config_tracker_->DetachFromPrefService(); if (protocol_handler_registry_) @@ -1547,10 +1548,11 @@ void ProfileImpl::InitChromeOSPreferences() { #endif // defined(OS_CHROMEOS) PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() { - if (!pref_proxy_config_tracker_) - pref_proxy_config_tracker_ = new PrefProxyConfigTracker(GetPrefs()); - - return pref_proxy_config_tracker_; + if (!pref_proxy_config_tracker_.get()) { + pref_proxy_config_tracker_.reset( + ProxyServiceFactory::CreatePrefProxyConfigTracker(GetPrefs())); + } + return pref_proxy_config_tracker_.get(); } chrome_browser_net::Predictor* ProfileImpl::GetNetworkPredictor() { |