Update To 11.40.268.0

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

diff --git a/src/chrome/browser/prefs/tracked/tracked_preference_helper.cc b/src/chrome/browser/prefs/tracked/tracked_preference_helper.cc
index 90bc11f..1da583f 100644 (file)
--- a/src/chrome/browser/prefs/tracked/tracked_preference_helper.cc
+++ b/src/chrome/browser/prefs/tracked/tracked_preference_helper.cc
@@ -26,6 +26,7 @@ TrackedPreferenceHelper::ResetAction TrackedPreferenceHelper::GetAction(
     case PrefHashStoreTransaction::CLEARED:
       // Unfortunate case, but there is nothing we can do.
       return DONT_RESET;
+    case PrefHashStoreTransaction::TRUSTED_NULL_VALUE:  // Falls through.
     case PrefHashStoreTransaction::TRUSTED_UNKNOWN_VALUE:
       // It is okay to seed the hash in this case.
       return DONT_RESET;
@@ -69,6 +70,10 @@ void TrackedPreferenceHelper::ReportValidationResult(
       UMA_HISTOGRAM_ENUMERATION("Settings.TrackedPreferenceTrustedInitialized",
                                 reporting_id_, reporting_ids_count_);
       return;
+    case PrefHashStoreTransaction::TRUSTED_NULL_VALUE:
+      UMA_HISTOGRAM_ENUMERATION("Settings.TrackedPreferenceNullInitialized",
+                                reporting_id_, reporting_ids_count_);
+      return;
   }
   NOTREACHED() << "Unexpected PrefHashStoreTransaction::ValueState: "
                << value_state;