| Index: components/data_reduction_proxy/browser/data_reduction_proxy_settings.h
|
| diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_settings.h b/components/data_reduction_proxy/browser/data_reduction_proxy_settings.h
|
| index 7a1348caab991994adf426d89197e2b5f071b31a..fdb57c6fd4ef246b3c88b0bd0f91d3ac04627331 100644
|
| --- a/components/data_reduction_proxy/browser/data_reduction_proxy_settings.h
|
| +++ b/components/data_reduction_proxy/browser/data_reduction_proxy_settings.h
|
| @@ -16,6 +16,7 @@
|
| #include "base/threading/thread_checker.h"
|
| #include "components/data_reduction_proxy/browser/data_reduction_proxy_configurator.h"
|
| #include "components/data_reduction_proxy/browser/data_reduction_proxy_params.h"
|
| +#include "components/data_reduction_proxy/browser/data_reduction_proxy_statistics_prefs.h"
|
| #include "net/base/net_util.h"
|
| #include "net/base/network_change_notifier.h"
|
| #include "net/url_request/url_fetcher_delegate.h"
|
| @@ -103,7 +104,6 @@ class DataReductionProxySettings
|
| // |DataReductionProxySettings| instance.
|
| void InitDataReductionProxySettings(
|
| PrefService* prefs,
|
| - PrefService* local_state_prefs,
|
| net::URLRequestContextGetter* url_request_context_getter);
|
|
|
| // Initializes the data reduction proxy with profile and local state prefs,
|
| @@ -113,10 +113,14 @@ class DataReductionProxySettings
|
| // TODO(marq): Remove when iOS supports the new interface above.
|
| void InitDataReductionProxySettings(
|
| PrefService* prefs,
|
| - PrefService* local_state_prefs,
|
| net::URLRequestContextGetter* url_request_context_getter,
|
| DataReductionProxyConfigurator* configurator);
|
|
|
| + // Sets the |statistics_prefs_| to be used for data reduction proxy pref reads
|
| + // and writes.
|
| + void SetDataReductionProxyStatisticsPrefs(
|
| + DataReductionProxyStatisticsPrefs* statistics_prefs);
|
| +
|
| // Sets the |on_data_reduction_proxy_enabled_| callback and runs to register
|
| // the DataReductionProxyEnabled synthetic field trial.
|
| void SetOnDataReductionEnabledCallback(
|
| @@ -186,7 +190,6 @@ class DataReductionProxySettings
|
|
|
| // Virtualized for unit test support.
|
| virtual PrefService* GetOriginalProfilePrefs();
|
| - virtual PrefService* GetLocalStatePrefs();
|
|
|
| // Sets the proxy configs, enabling or disabling the proxy according to
|
| // the value of |enabled| and |alternative_enabled|. Use the alternative
|
| @@ -299,7 +302,7 @@ class DataReductionProxySettings
|
| BooleanPrefMember data_reduction_proxy_alternative_enabled_;
|
|
|
| PrefService* prefs_;
|
| - PrefService* local_state_prefs_;
|
| + DataReductionProxyStatisticsPrefs* statistics_prefs_;
|
|
|
| net::URLRequestContextGetter* url_request_context_getter_;
|
|
|
|
|