Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1774)

Unified Diff: chrome/browser/profiles/profile_impl.cc

Issue 382313003: Add data reduction functionality to all platforms. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add back IsDataReductionProxyEnabled(). Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 9cfe5359a26af2cbf1c6b47bb0931650131c5988..0e7d5b4d0ffd31e352899d75ffb3b0f9f6d5a34e 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -47,6 +47,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 +82,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 +118,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 +658,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 +678,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 +690,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(

Powered by Google App Engine
This is Rietveld 408576698