| Index: chrome/browser/profiles/profile_impl_io_data.cc
|
| diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc
|
| index 6a2b28b085cb06a293432d62b798870fae5d5dd5..e36e70d3eda34ecf4b8fbc2bba3d9ddf6c9055b3 100644
|
| --- a/chrome/browser/profiles/profile_impl_io_data.cc
|
| +++ b/chrome/browser/profiles/profile_impl_io_data.cc
|
| @@ -32,6 +32,7 @@
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "chrome/common/url_constants.h"
|
| +#include "components/data_reduction_proxy/browser/data_reduction_proxy_delayed_pref_service.h"
|
| #include "components/domain_reliability/monitor.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/cookie_store_factory.h"
|
| @@ -153,7 +154,9 @@ void ProfileImplIOData::Handle::Init(
|
| domain_reliability_monitor,
|
| const base::Callback<void(bool)>& data_reduction_proxy_unavailable,
|
| scoped_ptr<data_reduction_proxy::DataReductionProxyParams>
|
| - data_reduction_proxy_params) {
|
| + data_reduction_proxy_params,
|
| + scoped_ptr<data_reduction_proxy::DataReductionProxyDelayedPrefService>
|
| + data_reduction_proxy_delayed_pref_service) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| DCHECK(!io_data_->lazy_params_);
|
| DCHECK(predictor);
|
| @@ -189,6 +192,8 @@ void ProfileImplIOData::Handle::Init(
|
| data_reduction_proxy_unavailable;
|
| io_data_->data_reduction_proxy_params_ =
|
| data_reduction_proxy_params.Pass();
|
| + io_data_->data_reduction_proxy_delayed_pref_service_ =
|
| + data_reduction_proxy_delayed_pref_service.Pass();
|
| #endif // defined(SPDY_PROXY_AUTH_ORIGIN)
|
| }
|
|
|
| @@ -430,6 +435,8 @@ void ProfileImplIOData::InitializeInternal(
|
| data_reduction_proxy_usage_stats_.get());
|
| network_delegate()->set_data_reduction_proxy_auth_request_handler(
|
| data_reduction_proxy_auth_request_handler_.get());
|
| + network_delegate()->set_data_reduction_proxy_delayed_pref_service(
|
| + data_reduction_proxy_delayed_pref_service_.get());
|
| network_delegate()->set_on_resolve_proxy_handler(
|
| base::Bind(data_reduction_proxy::OnResolveProxyHandler));
|
| #endif // defined(SPDY_PROXY_AUTH_ORIGIN)
|
|
|