Split the NullInitialized signal out of TrustedInitialized.

chrome/browser/prefs/tracked/pref_hash_store_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/prefs/tracked/pref_hash_store_impl.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/tracked/hash_store_contents.h"
@@ skipping 115 matching lines @@
     const base::Value* initial_value) const {
   const base::DictionaryValue* hashes_dict = contents()->GetContents();
 
   std::string last_hash;
   if (hashes_dict)
     hashes_dict->GetString(path, &last_hash);
 
   if (last_hash.empty()) {
     // In the absence of a hash for this pref, always trust a NULL value, but
     // only trust an existing value if the initial hashes dictionary is trusted.
-    return (!initial_value || super_mac_valid_) ? TRUSTED_UNKNOWN_VALUE
-                                                : UNTRUSTED_UNKNOWN_VALUE;
+    if (!initial_value)
+      return TRUSTED_NULL_VALUE;
+    else if (super_mac_valid_)
+      return TRUSTED_UNKNOWN_VALUE;
+    else
+      return UNTRUSTED_UNKNOWN_VALUE;
   }
 
   PrefHashCalculator::ValidationResult validation_result =
       outer_->pref_hash_calculator_.Validate(path, initial_value, last_hash);
   switch (validation_result) {
     case PrefHashCalculator::VALID:
       return UNCHANGED;
     case PrefHashCalculator::VALID_SECURE_LEGACY:
       return SECURE_LEGACY;
     case PrefHashCalculator::INVALID:
@@ skipping 16 matching lines @@
 PrefHashStoreTransaction::ValueState
 PrefHashStoreImpl::PrefHashStoreTransactionImpl::CheckSplitValue(
     const std::string& path,
     const base::DictionaryValue* initial_split_value,
     std::vector<std::string>* invalid_keys) const {
   DCHECK(invalid_keys && invalid_keys->empty());
 
   std::map<std::string, std::string> split_macs;
   const bool has_hashes = GetSplitMacs(path, &split_macs);
 
-  // Treat NULL and empty the same; otherwise we would need to store a hash
-  // for the entire dictionary (or some other special beacon) to
-  // differentiate these two cases which are really the same for
-  // dictionaries.
+  // Treat NULL and empty the same; otherwise we would need to store a hash for
+  // the entire dictionary (or some other special beacon) to differentiate these
+  // two cases which are really the same for dictionaries.
   if (!initial_split_value || initial_split_value->empty())
     return has_hashes ? CLEARED : UNCHANGED;
 
   if (!has_hashes)
     return super_mac_valid_ ? TRUSTED_UNKNOWN_VALUE : UNTRUSTED_UNKNOWN_VALUE;
 
   bool has_secure_legacy_id_hashes = false;
   std::string keyed_path(path);
   keyed_path.push_back('.');
   const size_t common_part_length = keyed_path.length();
@@ skipping 114 matching lines @@
 bool PrefHashStoreImpl::PrefHashStoreTransactionImpl::IsSuperMACValid() const {
   return super_mac_valid_;
 }
 
 bool PrefHashStoreImpl::PrefHashStoreTransactionImpl::StampSuperMac() {
   if (!outer_->use_super_mac_ || super_mac_valid_)
     return false;
   super_mac_dirty_ = true;
   return true;
 }