Index: chrome/browser/profiles/profile_impl.cc |
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc |
index 6854aa557a3558f5a7e7fb4eaa00092796dc3e6b..a52981d37cba4b3ee89d5bf7c967b7b01360a70a 100644 |
--- a/chrome/browser/profiles/profile_impl.cc |
+++ b/chrome/browser/profiles/profile_impl.cc |
@@ -25,6 +25,7 @@ |
#include "base/synchronization/waitable_event.h" |
#include "base/threading/sequenced_worker_pool.h" |
#include "base/version.h" |
+ |
Alexei Svitkine (slow)
2014/08/27 20:18:47
Nit: Remove empty line.
Not at Google. Contact bengr
2014/08/28 18:59:28
Done.
|
#include "chrome/browser/autocomplete/autocomplete_classifier.h" |
#include "chrome/browser/autocomplete/shortcuts_backend.h" |
#include "chrome/browser/background/background_contents_service_factory.h" |
@@ -47,6 +48,7 @@ |
#include "chrome/browser/net/proxy_service_factory.h" |
#include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.h" |
#include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h" |
+#include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.h" |
#include "chrome/browser/net/ssl_config_service_manager.h" |
#include "chrome/browser/plugins/chrome_plugin_service_filter.h" |
#include "chrome/browser/plugins/plugin_prefs.h" |
@@ -81,6 +83,8 @@ |
#include "chrome/common/url_constants.h" |
#include "chrome/grit/chromium_strings.h" |
#include "components/bookmarks/browser/bookmark_model.h" |
+#include "components/data_reduction_proxy/browser/data_reduction_proxy_params.h" |
+#include "components/data_reduction_proxy/browser/data_reduction_proxy_settings.h" |
#include "components/dom_distiller/content/dom_distiller_viewer_source.h" |
#include "components/dom_distiller/core/url_constants.h" |
#include "components/domain_reliability/monitor.h" |
@@ -115,12 +119,6 @@ |
#include "components/user_manager/user_manager.h" |
#endif |
-#if defined(SPDY_PROXY_AUTH_ORIGIN) |
-#include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.h" |
-#include "components/data_reduction_proxy/browser/data_reduction_proxy_params.h" |
-#include "components/data_reduction_proxy/browser/data_reduction_proxy_settings.h" |
-#endif |
- |
#if defined(ENABLE_CONFIGURATION_POLICY) |
#include "chrome/browser/policy/schema_registry_service.h" |
#include "chrome/browser/policy/schema_registry_service_factory.h" |
@@ -661,7 +659,6 @@ void ProfileImpl::DoFinalInit() { |
scoped_ptr<data_reduction_proxy::DataReductionProxyParams> |
data_reduction_proxy_params; |
scoped_ptr<DataReductionProxyChromeConfigurator> chrome_configurator; |
-#if defined(SPDY_PROXY_AUTH_ORIGIN) |
DataReductionProxyChromeSettings* data_reduction_proxy_chrome_settings = |
DataReductionProxyChromeSettingsFactory::GetForBrowserContext(this); |
data_reduction_proxy_params = |
@@ -682,7 +679,6 @@ void ProfileImpl::DoFinalInit() { |
// settings after ownership is passed. |
DataReductionProxyChromeConfigurator* |
data_reduction_proxy_chrome_configurator = chrome_configurator.get(); |
-#endif |
// Make sure we initialize the ProfileIOData after everything else has been |
// initialized that we might be reading from the IO thread. |
@@ -695,14 +691,11 @@ void ProfileImpl::DoFinalInit() { |
data_reduction_proxy_unavailable, |
chrome_configurator.Pass(), |
data_reduction_proxy_params.Pass()); |
- |
-#if defined(SPDY_PROXY_AUTH_ORIGIN) |
data_reduction_proxy_chrome_settings->InitDataReductionProxySettings( |
data_reduction_proxy_chrome_configurator, |
prefs_.get(), |
g_browser_process->local_state(), |
GetRequestContext()); |
-#endif |
#if defined(ENABLE_PLUGINS) |
ChromePluginServiceFilter::GetInstance()->RegisterResourceContext( |