Chromium Code Reviews| Index: chrome/browser/profiles/profile_impl.cc |
| diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc |
| index 8c359567fdcb4aaedefb518deed280f0a75ced1b..1e95a698a9c2efecd51e350db04bf2d1a2b6d056 100644 |
| --- a/chrome/browser/profiles/profile_impl.cc |
| +++ b/chrome/browser/profiles/profile_impl.cc |
| @@ -44,6 +44,7 @@ |
| #include "chrome/browser/download/chrome_download_manager_delegate.h" |
| #include "chrome/browser/download/download_service.h" |
| #include "chrome/browser/download/download_service_factory.h" |
| +#include "chrome/browser/net/net_pref_observer.h" |
| #include "chrome/browser/net/predictor.h" |
| #include "chrome/browser/net/proxy_service_factory.h" |
| #include "chrome/browser/permissions/permission_manager.h" |
| @@ -115,6 +116,7 @@ |
| #include "content/public/common/content_constants.h" |
| #include "content/public/common/page_zoom.h" |
| #include "extensions/features/features.h" |
| +#include "net/http/http_network_session.h" |
| #include "ppapi/features/features.h" |
| #include "printing/features/features.h" |
| #include "ui/base/l10n/l10n_util.h" |
| @@ -622,6 +624,13 @@ void ProfileImpl::DoFinalInit() { |
| session_cookie_mode, GetSpecialStoragePolicy(), |
| CreateDomainReliabilityMonitor(local_state)); |
| + DCHECK(!net_pref_observer_); |
| + NetPrefObserver::UpdateNetParamsCallback update_net_params_callback = |
| + base::Bind(&ProfileImplIOData::Handle::UpdateNetParamsOnIOThread, |
| + base::Unretained(&io_data_)); |
| + net_pref_observer_ = base::MakeUnique<NetPrefObserver>( |
| + prefs_.get(), update_net_params_callback); |
|
mmenke
2017/01/06 16:18:43
Why can't all this be done in ProfileIOData::Initi
pmarko
2017/01/08 20:51:48
Done.
|
| + |
| #if BUILDFLAG(ENABLE_PLUGINS) |
| ChromePluginServiceFilter::GetInstance()->RegisterResourceContext( |
| this, io_data_.GetResourceContextNoInit()); |