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 f974b66590c8595087f40682d142e6128f840737..d840732a51760b766976afd612003478debf9ce9 100644 |
--- a/components/data_reduction_proxy/browser/data_reduction_proxy_settings.h |
+++ b/components/data_reduction_proxy/browser/data_reduction_proxy_settings.h |
@@ -12,9 +12,11 @@ |
#include "base/compiler_specific.h" |
#include "base/gtest_prod_util.h" |
#include "base/memory/scoped_ptr.h" |
+#include "base/memory/weak_ptr.h" |
#include "base/prefs/pref_member.h" |
#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_delayed_pref_service.h" |
#include "components/data_reduction_proxy/browser/data_reduction_proxy_params.h" |
#include "net/base/net_util.h" |
#include "net/base/network_change_notifier.h" |
@@ -103,7 +105,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 +114,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, |
scoped_ptr<DataReductionProxyConfigurator> configurator); |
+ // Sets the |delayed_prefs_| weak pointer to be used for data reduction proxy |
+ // pref reads and writes |
+ void SetDataReductionProxyDelayedPrefService( |
+ base::WeakPtr<DataReductionProxyDelayedPrefService> delayed_prefs); |
+ |
// Sets the |on_data_reduction_proxy_enabled_| callback and runs to register |
// the DataReductionProxyEnabled synthetic field trial. |
void SetOnDataReductionEnabledCallback( |
@@ -190,7 +195,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 |
@@ -307,7 +311,7 @@ class DataReductionProxySettings |
BooleanPrefMember data_reduction_proxy_alternative_enabled_; |
PrefService* prefs_; |
- PrefService* local_state_prefs_; |
+ base::WeakPtr<DataReductionProxyDelayedPrefService> delayed_prefs_; |
bengr
2014/08/14 17:39:42
I think this object is owned by ProfileImplIOData,
megjablon
2014/08/26 19:28:41
Done.
|
net::URLRequestContextGetter* url_request_context_getter_; |