summaryrefslogtreecommitdiffstats
path: root/ios
diff options
context:
space:
mode:
authorsdefresne <sdefresne@chromium.org>2015-11-24 08:26:39 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-24 16:28:16 +0000
commit00e1e6c710ed420e00cf457b5048d813b7a3c2cb (patch)
treef386246ae04449c7b090fb8eecfc539377e0d4f3 /ios
parent7c9159b5b7a8b9676badd1b93cf2cf3bc78fdf47 (diff)
downloadchromium_src-00e1e6c710ed420e00cf457b5048d813b7a3c2cb.zip
chromium_src-00e1e6c710ed420e00cf457b5048d813b7a3c2cb.tar.gz
chromium_src-00e1e6c710ed420e00cf457b5048d813b7a3c2cb.tar.bz2
Move kDataReductionProxy registration to the data_reduction_proxy component.
The pref data_reduction_proxy::prefs::kDataReductionProxy should have been part of data_reduction_proxy::RegisterPrefs() to avoid having all embedder register it manually just before call said function. BUG=557814 Review URL: https://codereview.chromium.org/1463973003 Cr-Commit-Position: refs/heads/master@{#361358}
Diffstat (limited to 'ios')
-rw-r--r--ios/chrome/browser/prefs/browser_prefs.mm6
1 files changed, 0 insertions, 6 deletions
diff --git a/ios/chrome/browser/prefs/browser_prefs.mm b/ios/chrome/browser/prefs/browser_prefs.mm
index 017eb4e..7e61b40 100644
--- a/ios/chrome/browser/prefs/browser_prefs.mm
+++ b/ios/chrome/browser/prefs/browser_prefs.mm
@@ -8,7 +8,6 @@
#include "components/autofill/core/browser/autofill_manager.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.h"
-#include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h"
#include "components/dom_distiller/core/distilled_page_prefs.h"
#include "components/enhanced_bookmarks/bookmark_server_cluster_service.h"
#include "components/gcm_driver/gcm_channel_status_syncer.h"
@@ -67,11 +66,6 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
[OmniboxGeolocationLocalState registerLocalState:registry];
[MemoryDebuggerManager registerLocalState:registry];
- // TODO(crbug.com/557814): data_reduction_proxy::prefs::kDataReductionProxy
- // should be registered by data_reduction_proxy::RegisterPrefs() instead of
- // here.
- registry->RegisterStringPref(data_reduction_proxy::prefs::kDataReductionProxy,
- std::string());
data_reduction_proxy::RegisterPrefs(registry);
// TODO(shreyasv): Remove this in M49 as almost all users would have the