Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / prefs / pref_hash_filter.cc

diff --git a/src/chrome/browser/prefs/pref_hash_filter.cc b/src/chrome/browser/prefs/pref_hash_filter.cc
index 8bdf994..fe216e8 100644 (file)
--- a/src/chrome/browser/prefs/pref_hash_filter.cc
+++ b/src/chrome/browser/prefs/pref_hash_filter.cc
@@ -21,13 +21,36 @@
 #include "chrome/common/pref_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 
+namespace {
+
+void CleanupDeprecatedTrackedPreferences(
+    base::DictionaryValue* pref_store_contents,
+    PrefHashStoreTransaction* hash_store_transaction) {
+  // Add deprecated previously tracked preferences below for them to be cleaned
+  // up from both the pref files and the hash store.
+  static const char* kDeprecatedTrackedPreferences[] = {
+    // TODO(gab): Remove in M41+.
+    "extensions.known_disabled",
+  };
+
+  for (size_t i = 0; i < arraysize(kDeprecatedTrackedPreferences); ++i) {
+    const char* key = kDeprecatedTrackedPreferences[i];
+    pref_store_contents->Remove(key, NULL);
+    hash_store_transaction->ClearHash(key);
+  }
+}
+
+}  // namespace
+
 PrefHashFilter::PrefHashFilter(
     scoped_ptr<PrefHashStore> pref_hash_store,
     const std::vector<TrackedPreferenceMetadata>& tracked_preferences,
+    const base::Closure& on_reset_on_load,
     TrackedPreferenceValidationDelegate* delegate,
     size_t reporting_ids_count,
     bool report_super_mac_validity)
     : pref_hash_store_(pref_hash_store.Pass()),
+      on_reset_on_load_(on_reset_on_load),
       report_super_mac_validity_(report_super_mac_validity) {
   DCHECK(pref_hash_store_);
   DCHECK_GE(reporting_ids_count, tracked_preferences.size());
@@ -163,6 +186,10 @@ void PrefHashFilter::FinalizeFilterOnLoad(
     scoped_ptr<PrefHashStoreTransaction> hash_store_transaction(
         pref_hash_store_->BeginTransaction(scoped_ptr<HashStoreContents>(
             new DictionaryHashStoreContents(pref_store_contents.get()))));
+
+    CleanupDeprecatedTrackedPreferences(
+        pref_store_contents.get(), hash_store_transaction.get());
+
     if (report_super_mac_validity_) {
       UMA_HISTOGRAM_BOOLEAN("Settings.HashesDictionaryTrusted",
                             hash_store_transaction->IsSuperMACValid());
@@ -185,6 +212,9 @@ void PrefHashFilter::FinalizeFilterOnLoad(
                              new base::StringValue(base::Int64ToString(
                                  base::Time::Now().ToInternalValue())));
     FilterUpdate(prefs::kPreferenceResetTime);
+
+    if (!on_reset_on_load_.is_null())
+      on_reset_on_load_.Run();
   }
 
   // TODO(gab): Remove this histogram by Feb 21 2014; after sufficient timing