| Index: chrome/browser/profiles/profile_io_data.h
|
| diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
|
| index 34fcb6451f40d5ef92382fb79f7861332491d0ab..5da94842cdffd93b47860b5b414f53b2eb0d9724 100644
|
| --- a/chrome/browser/profiles/profile_io_data.h
|
| +++ b/chrome/browser/profiles/profile_io_data.h
|
| @@ -22,6 +22,7 @@
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/profiles/storage_partition_descriptor.h"
|
| #include "components/content_settings/core/common/content_settings_types.h"
|
| +#include "components/data_reduction_proxy/browser/data_reduction_proxy_settings.h"
|
| #include "components/data_reduction_proxy/browser/data_reduction_proxy_usage_stats.h"
|
| #include "content/public/browser/content_browser_client.h"
|
| #include "content/public/browser/resource_context.h"
|
| @@ -176,13 +177,11 @@ class ProfileIOData {
|
| return &safe_browsing_enabled_;
|
| }
|
|
|
| -#if defined(SPDY_PROXY_AUTH_ORIGIN)
|
| // TODO(feng): move the function to protected area.
|
| // IsDataReductionProxyEnabled() should be used as public API.
|
| BooleanPrefMember* data_reduction_proxy_enabled() const {
|
| return &data_reduction_proxy_enabled_;
|
| }
|
| -#endif
|
|
|
| BooleanPrefMember* printing_enabled() const {
|
| return &printing_enabled_;
|
| @@ -249,11 +248,9 @@ class ProfileIOData {
|
| // should only be called from there.
|
| bool GetMetricsEnabledStateOnIOThread() const;
|
|
|
| -#if defined(OS_ANDROID)
|
| // Returns whether or not data reduction proxy is enabled in the browser
|
| // instance on which this profile resides.
|
| bool IsDataReductionProxyEnabled() const;
|
| -#endif
|
|
|
| void set_client_cert_store_factory_for_testing(
|
| const base::Callback<scoped_ptr<net::ClientCertStore>()>& factory) {
|
| @@ -536,9 +533,7 @@ class ProfileIOData {
|
| mutable BooleanPrefMember enable_do_not_track_;
|
| mutable BooleanPrefMember force_safesearch_;
|
| mutable BooleanPrefMember safe_browsing_enabled_;
|
| -#if defined(SPDY_PROXY_AUTH_ORIGIN)
|
| mutable BooleanPrefMember data_reduction_proxy_enabled_;
|
| -#endif
|
| mutable BooleanPrefMember printing_enabled_;
|
| mutable BooleanPrefMember sync_disabled_;
|
| mutable BooleanPrefMember signin_allowed_;
|
|
|