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 259c15ef6d3ea985a18c531966c7e52be8d65d8e..87cb8cae52f1a7d043b5d54c7a84bb20fa25f2e8 100644 |
| --- a/chrome/browser/profiles/profile_impl.cc |
| +++ b/chrome/browser/profiles/profile_impl.cc |
| @@ -83,7 +83,6 @@ |
| #include "chrome/grit/chromium_strings.h" |
| #include "components/bookmarks/browser/bookmark_model.h" |
| #include "components/content_settings/core/browser/host_content_settings_map.h" |
| -#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator.h" |
| #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.h" |
| #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h" |
| #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_statistics_prefs.h" |
| @@ -112,6 +111,7 @@ |
| #if defined(OS_ANDROID) |
| #include "chrome/browser/media/protected_media_identifier_permission_context.h" |
| #include "chrome/browser/media/protected_media_identifier_permission_context_factory.h" |
| +#include "components/data_reduction_proxy/content/browser/data_reduction_proxy_ui_service.h" |
| #endif |
| #if defined(OS_CHROMEOS) |
| @@ -648,6 +648,11 @@ void ProfileImpl::DoFinalInit() { |
| scoped_ptr<data_reduction_proxy::DataReductionProxyStatisticsPrefs> |
| data_reduction_proxy_statistics_prefs; |
| scoped_ptr<data_reduction_proxy::DataReductionProxyEventStore> event_store; |
| +#if defined(OS_ANDROID) |
|
mmenke
2015/01/09 15:25:13
Also, why are we creating this on the UI thread in
mmenke
2015/01/09 15:25:13
Why is this only for Android? Why are we passing
megjablon
2015/01/12 22:01:58
Ya, it makes more sense where we call "set_proxy_c
megjablon
2015/01/12 22:01:58
Sent an email with why this is Android only.
mmenke
2015/01/12 22:06:07
Sorry, I meant why is this not on desktop (Where,
|
| + scoped_ptr<data_reduction_proxy::DataReductionProxyUIService> |
| + data_reduction_proxy_ui_service( |
| + new data_reduction_proxy::DataReductionProxyUIService()); |
| +#endif |
| DataReductionProxyChromeSettings* data_reduction_proxy_chrome_settings = |
| DataReductionProxyChromeSettingsFactory::GetForBrowserContext(this); |
| data_reduction_proxy_params = |
| @@ -714,6 +719,9 @@ void ProfileImpl::DoFinalInit() { |
| configurator.Pass(), |
| data_reduction_proxy_params.Pass(), |
| data_reduction_proxy_statistics_prefs.Pass(), |
| +#if defined(OS_ANDROID) |
| + data_reduction_proxy_ui_service.Pass(), |
| +#endif |
| event_store.Pass()); |
| data_reduction_proxy_chrome_settings->InitDataReductionProxySettings( |
| data_reduction_proxy_configurator, |