Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1053)

Unified Diff: components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.cc

Issue 2447013003: Remove unused DRP code for migrating prefs (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.cc
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.cc
index e3bbec42f012e58eb83452d2b571e568ad950aa8..c2b2b4470407b209e27e4f46c2d300153fa9fd8f 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.cc
@@ -12,22 +12,6 @@
#include "components/prefs/pref_service.h"
#include "components/prefs/scoped_user_pref_update.h"
-namespace {
-
-void TransferPrefList(const char* pref_path,
- PrefService* src,
- PrefService* dest) {
- DCHECK(src->FindPreference(pref_path)->GetType() == base::Value::TYPE_LIST);
- ListPrefUpdate update_dest(dest, pref_path);
- std::unique_ptr<base::ListValue> src_list(
- src->GetList(pref_path)->DeepCopy());
- update_dest->Swap(src_list.get());
- ListPrefUpdate update_src(src, pref_path);
- src->ClearPref(pref_path);
-}
-
-} // namespace
-
namespace data_reduction_proxy {
// Make sure any changes here that have the potential to impact android_webview
@@ -43,7 +27,6 @@ void RegisterSyncableProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterInt64Pref(prefs::kHttpReceivedContentLength, 0);
registry->RegisterInt64Pref(prefs::kHttpOriginalContentLength, 0);
- registry->RegisterBooleanPref(prefs::kStatisticsPrefsMigrated, false);
registry->RegisterListPref(prefs::kDailyHttpOriginalContentLength);
registry->RegisterInt64Pref(prefs::kDailyHttpOriginalContentLengthApplication,
0L);
@@ -116,9 +99,6 @@ void RegisterSimpleProfilePrefs(PrefRegistrySimple* registry) {
prefs::kDataReductionProxyWasEnabledBefore, false);
registry->RegisterBooleanPref(prefs::kDataUsageReportingEnabled, false);
-
- registry->RegisterBooleanPref(
- prefs::kStatisticsPrefsMigrated, false);
RegisterPrefs(registry);
}
@@ -197,64 +177,4 @@ void RegisterPrefs(PrefRegistrySimple* registry) {
registry->RegisterStringPref(prefs::kDataReductionProxyConfig, std::string());
}
-void MigrateStatisticsPrefs(PrefService* local_state_prefs,
- PrefService* profile_prefs) {
- if (profile_prefs->GetBoolean(prefs::kStatisticsPrefsMigrated))
- return;
- if (local_state_prefs == profile_prefs) {
- profile_prefs->SetBoolean(prefs::kStatisticsPrefsMigrated, true);
- return;
- }
- profile_prefs->SetInt64(
- prefs::kHttpReceivedContentLength,
- local_state_prefs->GetInt64(prefs::kHttpReceivedContentLength));
- local_state_prefs->ClearPref(prefs::kHttpReceivedContentLength);
- profile_prefs->SetInt64(
- prefs::kHttpOriginalContentLength,
- local_state_prefs->GetInt64(prefs::kHttpOriginalContentLength));
- local_state_prefs->ClearPref(prefs::kHttpOriginalContentLength);
- TransferPrefList(
- prefs::kDailyHttpOriginalContentLength, local_state_prefs, profile_prefs);
- TransferPrefList(
- prefs::kDailyHttpReceivedContentLength, local_state_prefs, profile_prefs);
- TransferPrefList(
- prefs::kDailyOriginalContentLengthWithDataReductionProxyEnabled,
- local_state_prefs,
- profile_prefs);
- TransferPrefList(
- prefs::kDailyContentLengthWithDataReductionProxyEnabled,
- local_state_prefs,
- profile_prefs);
- TransferPrefList(
- prefs::kDailyContentLengthHttpsWithDataReductionProxyEnabled,
- local_state_prefs,
- profile_prefs);
- TransferPrefList(
- prefs::kDailyContentLengthShortBypassWithDataReductionProxyEnabled,
- local_state_prefs,
- profile_prefs);
- TransferPrefList(
- prefs::kDailyContentLengthLongBypassWithDataReductionProxyEnabled,
- local_state_prefs,
- profile_prefs);
- TransferPrefList(
- prefs::kDailyContentLengthUnknownWithDataReductionProxyEnabled,
- local_state_prefs,
- profile_prefs);
- TransferPrefList(
- prefs::kDailyOriginalContentLengthViaDataReductionProxy,
- local_state_prefs,
- profile_prefs);
- TransferPrefList(
- prefs::kDailyContentLengthViaDataReductionProxy,
- local_state_prefs,
- profile_prefs);
- profile_prefs->SetInt64(
- prefs::kDailyHttpContentLengthLastUpdateDate,
- local_state_prefs->GetInt64(
- prefs::kDailyHttpContentLengthLastUpdateDate));
- local_state_prefs->ClearPref(prefs::kDailyHttpContentLengthLastUpdateDate);
- profile_prefs->SetBoolean(prefs::kStatisticsPrefsMigrated, true);
-}
-
} // namespace data_reduction_proxy

Powered by Google App Engine
This is Rietveld 408576698