summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authorbengr <bengr@chromium.org>2015-12-09 15:24:12 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-09 23:25:25 +0000
commit13dffa5623ffeab9f5590a2da16717fae031ece2 (patch)
tree3e4829a68686b94c74b29fe25d612dc7fdb2d686 /android_webview
parent0039fe7f3439c2844ea9d702cec9193d8eb81eef (diff)
downloadchromium_src-13dffa5623ffeab9f5590a2da16717fae031ece2.zip
chromium_src-13dffa5623ffeab9f5590a2da16717fae031ece2.tar.gz
chromium_src-13dffa5623ffeab9f5590a2da16717fae031ece2.tar.bz2
Moved data saver pref out of data reduction proxy component.
The data saver pref name is instead defined in Chrome, Android WebView, and Cronet, and passed into the Data Reduction Proxy during initialization. BUG=564335 Review URL: https://codereview.chromium.org/1512673003 Cr-Commit-Position: refs/heads/master@{#364208}
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/browser/aw_browser_context.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc
index 4f3fdb1..12a2fb6 100644
--- a/android_webview/browser/aw_browser_context.cc
+++ b/android_webview/browser/aw_browser_context.cc
@@ -60,6 +60,8 @@ const char kAuthServerWhitelist[] = "auth.server_whitelist";
} // namespace prefs
namespace {
+// Name of the preference that governs enabling the Data Reduction Proxy.
+const char kDataReductionProxyEnabled[] = "data_reduction_proxy.enabled";
// Shows notifications which correspond to PersistentPrefStore's reading errors.
void HandleReadError(PersistentPrefStore::PrefReadError error) {
@@ -243,6 +245,7 @@ void AwBrowserContext::PreMainMessageLoopRun() {
// TODO(dgn) lazy init, see http://crbug.com/521542
data_reduction_proxy_settings_->InitDataReductionProxySettings(
+ kDataReductionProxyEnabled,
user_pref_service_.get(), data_reduction_proxy_io_data_.get(),
data_reduction_proxy_service_.Pass());
data_reduction_proxy_settings_->MaybeActivateDataReductionProxy(true);
@@ -325,6 +328,7 @@ void AwBrowserContext::InitUserPrefService() {
autofill::prefs::kAutofillPositiveUploadRate, 0.0);
pref_registry->RegisterDoublePref(
autofill::prefs::kAutofillNegativeUploadRate, 0.0);
+ pref_registry->RegisterBooleanPref(kDataReductionProxyEnabled, false);
data_reduction_proxy::RegisterSimpleProfilePrefs(pref_registry);
policy::URLBlacklistManager::RegisterProfilePrefs(pref_registry);