Chrome Settings Hardening

chrome/browser/prefs/pref_hash_filter.cc

Index: chrome/browser/prefs/pref_hash_filter.cc
diff --git a/chrome/browser/prefs/pref_hash_filter.cc b/chrome/browser/prefs/pref_hash_filter.cc
index 803ff138f6f4563af3e8522a17b3392a64d85757..3d13a5a298ec953b5bf367616d0b66cb7ccbc606 100644
--- a/chrome/browser/prefs/pref_hash_filter.cc
+++ b/chrome/browser/prefs/pref_hash_filter.cc
@@ -7,58 +7,33 @@
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/values.h"
-#include "chrome/browser/prefs/pref_hash_store.h"
 #include "chrome/common/pref_names.h"
 
 namespace {
 
-// These preferences must be kept in sync with the TrackedPreference enum in
-// tools/metrics/histograms/histograms.xml. To add a new preference, append it
-// to the array and add a corresponding value to the histogram enum. Replace
-// removed preferences with "".
-const char* kTrackedPrefs[] = {
-  prefs::kShowHomeButton,
-  prefs::kHomePageIsNewTabPage,
-  prefs::kHomePage,
-  prefs::kRestoreOnStartup,
-  prefs::kURLsToRestoreOnStartup,
-  prefs::kExtensionsPref,
-  prefs::kGoogleServicesLastUsername,
-  prefs::kSearchProviderOverrides,
-  prefs::kDefaultSearchProviderSearchURL,
-  prefs::kDefaultSearchProviderKeyword,
-  prefs::kDefaultSearchProviderName,
-#if !defined(OS_ANDROID)
-  prefs::kPinnedTabs,
-#else
-  "",
-#endif
-  prefs::kExtensionKnownDisabled,
-  prefs::kProfileResetPromptMemento,
-};
-
 void ReportValidationResult(PrefHashStore::ValueState value_state,
-                            size_t value_index) {
+                            size_t value_index,
+                            size_t num_values) {
   switch (value_state) {
     case PrefHashStore::UNCHANGED:
       UMA_HISTOGRAM_ENUMERATION("Settings.TrackedPreferenceUnchanged",
-                                value_index, arraysize(kTrackedPrefs));
+                                value_index, num_values);
       return;
     case PrefHashStore::CLEARED:
       UMA_HISTOGRAM_ENUMERATION("Settings.TrackedPreferenceCleared",
-                                value_index, arraysize(kTrackedPrefs));
+                                value_index, num_values);
       return;
     case PrefHashStore::MIGRATED:
       UMA_HISTOGRAM_ENUMERATION("Settings.TrackedPreferenceMigrated",
-                                value_index, arraysize(kTrackedPrefs));
+                                value_index, num_values);
       return;
     case PrefHashStore::CHANGED:
       UMA_HISTOGRAM_ENUMERATION("Settings.TrackedPreferenceChanged",
-                                value_index, arraysize(kTrackedPrefs));
+                                value_index, num_values);
       return;
     case PrefHashStore::UNKNOWN_VALUE:
       UMA_HISTOGRAM_ENUMERATION("Settings.TrackedPreferenceInitialized",
-                                value_index, arraysize(kTrackedPrefs));
+                                value_index, num_values);
       return;
   }
   NOTREACHED() << "Unexpected PrefHashStore::ValueState: " << value_state;
@@ -66,9 +41,25 @@ void ReportValidationResult(PrefHashStore::ValueState value_state,
 
 }  // namespace
 
-PrefHashFilter::PrefHashFilter(scoped_ptr<PrefHashStore> pref_hash_store)
+PrefHashFilter::PrefHashFilter(scoped_ptr<PrefHashStore> pref_hash_store,
+                               const TrackedPreference tracked_preferences[],
+                               size_t tracked_preferences_size,
+                               size_t reporting_ids_count,
+                               EnforcementLevel enforcement_level)
     : pref_hash_store_(pref_hash_store.Pass()),
-      tracked_paths_(kTrackedPrefs, kTrackedPrefs + arraysize(kTrackedPrefs)) {}
+      reporting_ids_count_(reporting_ids_count),
+      enforce_(enforcement_level >= ENFORCE),
+      no_seeding_(enforcement_level >= ENFORCE_NO_SEEDING),
+      no_migration_(enforcement_level >= ENFORCE_NO_SEEDING_NO_MIGRATION) {
+  DCHECK_GE(reporting_ids_count, tracked_preferences_size);
+
+  for (size_t i = 0; i < tracked_preferences_size; ++i) {
+    bool is_new = tracked_paths_.insert(std::make_pair(
+        std::string(tracked_preferences[i].name),
+        tracked_preferences[i])).second;
+    DCHECK(is_new);
+  }
+}
 
 PrefHashFilter::~PrefHashFilter() {}
 
@@ -82,15 +73,60 @@ void PrefHashFilter::FilterUpdate(const std::string& path,
 // Validates loaded preference values according to stored hashes, reports
 // validation results via UMA, and updates hashes in case of mismatch.
 void PrefHashFilter::FilterOnLoad(base::DictionaryValue* pref_store_contents) {
-  for (size_t i = 0; i < arraysize(kTrackedPrefs); ++i) {
-    if (kTrackedPrefs[i][0] == '\0')
-      continue;
+  DCHECK(pref_store_contents);
+  for (TrackedPreferencesMap::const_iterator it = tracked_paths_.begin();
+       it != tracked_paths_.end(); ++it) {
+    const std::string& pref_path = it->first;
+    const TrackedPreference& metadata = it->second;
     const base::Value* value = NULL;
-    pref_store_contents->Get(kTrackedPrefs[i], &value);
+    pref_store_contents->Get(pref_path, &value);
+
     PrefHashStore::ValueState value_state =
-        pref_hash_store_->CheckValue(kTrackedPrefs[i], value);
-    ReportValidationResult(value_state, i);
-    if (value_state != PrefHashStore::UNCHANGED)
-      pref_hash_store_->StoreHash(kTrackedPrefs[i], value);
+        pref_hash_store_->CheckValue(pref_path, value);
+    ReportValidationResult(value_state, metadata.reporting_id,
+                           reporting_ids_count_);
+
+    enum {
+      DONT_RESET,
+      WANTED_RESET,
+      DO_RESET,
+    } reset_state = DONT_RESET;
+    if (metadata.allow_enforcement) {
+      switch (value_state) {
+        case PrefHashStore::UNCHANGED:
+          // Desired case, nothing to do.
+          break;
+        case PrefHashStore::CLEARED:
+          // Unfortunate case, but there is nothing we can do.
+          break;
+        case PrefHashStore::MIGRATED:
+          reset_state = no_migration_ ? DO_RESET : WANTED_RESET;
+          break;
+        case PrefHashStore::UNKNOWN_VALUE:
+          reset_state = no_seeding_ ? DO_RESET : WANTED_RESET;
+          break;
+        case PrefHashStore::CHANGED:
+          reset_state = enforce_ ? DO_RESET : WANTED_RESET;
+          break;
+      }
+    }
+
+    if (reset_state == DO_RESET) {
+      UMA_HISTOGRAM_ENUMERATION("Settings.TrackedPreferenceReset",
+                                metadata.reporting_id, reporting_ids_count_);
+      // TODO(gab): Store the |old_value| to provide an undo UI.
+      scoped_ptr<base::Value> old_value;
+      pref_store_contents->RemovePath(pref_path, &old_value);
+    } else if (reset_state == WANTED_RESET) {
+      UMA_HISTOGRAM_ENUMERATION("Settings.TrackedPreferenceWantedReset",
+                                metadata.reporting_id, reporting_ids_count_);
+    }
+
+    if (value_state != PrefHashStore::UNCHANGED) {
+      // Store the hash for the new value (whether it was reset or not).
+      const base::Value* new_value = NULL;
+      pref_store_contents->Get(pref_path, &new_value);
+      pref_hash_store_->StoreHash(pref_path, new_value);
+    }
   }
 }