Integrate registry_hash_store_contents with the rest of tracked prefs.

components/user_prefs/tracked/tracked_atomic_preference.cc

 // Copyright 2014 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 "components/user_prefs/tracked/tracked_atomic_preference.h"
 
 #include "base/values.h"
 #include "components/user_prefs/tracked/pref_hash_store_transaction.h"
 #include "components/user_prefs/tracked/tracked_preference_validation_delegate.h"
 
@@ skipping 14 matching lines @@
 }
 
 void TrackedAtomicPreference::OnNewValue(
     const base::Value* value,
     PrefHashStoreTransaction* transaction) const {
   transaction->StoreHash(pref_path_, value);
 }
 
 bool TrackedAtomicPreference::EnforceAndReport(
     base::DictionaryValue* pref_store_contents,
-    PrefHashStoreTransaction* transaction) const {
+    PrefHashStoreTransaction* transaction,
+    PrefHashStoreTransaction* registry_transaction) const {
   const base::Value* value = NULL;
   pref_store_contents->Get(pref_path_, &value);
   PrefHashStoreTransaction::ValueState value_state =
       transaction->CheckValue(pref_path_, value);
+  helper_.ReportValidationResult(value_state, transaction->GetStoreType());
 
-  helper_.ReportValidationResult(value_state);
+  PrefHashStoreTransaction::ValueState registry_value_state =

[gab, 2016/08/03 18:19:36]

Unused outside of if scope below, move it in there.

[proberge, 2016/08/04 00:13:46]

Used on line 76 to decide whether to update the registry.

+      PrefHashStoreTransaction::UNCHANGED;
+  if (registry_transaction) {
+    registry_value_state = registry_transaction->CheckValue(pref_path_, value);
+    helper_.ReportValidationResult(registry_value_state,
+                                   registry_transaction->GetStoreType());

[gab, 2016/08/03 18:19:36]

Instead of adding "StoreType", I'd prefer to make this more generic, i.e.
GetUMAPrefix() -- then TrackedPreferenceHelper doesn't need to all of a sudden
depend on HashStoreContents (and worse, depend on its impl types.

[proberge, 2016/08/04 00:13:46]

The issue with GetUMAPrefix is that it's odd for DictionaryHashStoreContents to
return an empty string (to avoid changing the existing metrics). 
The dependency is on an enum, not the impl type. 

[gab, 2016/08/05 19:59:25]

I think that's fine, there can be a comment on it explaining why.
But the enum has to be aligned with the impl types, exposing implementation
details in the interface

 
-  TrackedPreferenceHelper::ResetAction reset_action =
-      helper_.GetAction(value_state);
+    // TODO(proberge): Call delegate_->OnAtomicPreferenceValidation.
+  }
+
   if (delegate_) {
     delegate_->OnAtomicPreferenceValidation(pref_path_, value, value_state,
                                             helper_.IsPersonal());
   }
+  TrackedPreferenceHelper::ResetAction reset_action =
+      helper_.GetAction(value_state);
   helper_.ReportAction(reset_action);
 
   bool was_reset = false;
   if (reset_action == TrackedPreferenceHelper::DO_RESET) {
     pref_store_contents->RemovePath(pref_path_, NULL);
     was_reset = true;
   }
 
   if (value_state != PrefHashStoreTransaction::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);
     transaction->StoreHash(pref_path_, new_value);
   }
 
+  if (registry_transaction &&
+      (value_state != PrefHashStoreTransaction::UNCHANGED ||

[gab, 2016/08/03 18:19:36]

Here I think what you want to check is |was_reset|.

i.e. if you have an external_validation_transaction and either the pref was
reset or your external MAC was invalid, you want to store a new MAC?

[proberge, 2016/08/04 00:13:46]

Done.

+       registry_value_state != PrefHashStoreTransaction::UNCHANGED)) {
+    const base::Value* new_value = NULL;
+    pref_store_contents->Get(pref_path_, &new_value);
+    registry_transaction->StoreHash(pref_path_, new_value);
+  }
+
   return was_reset;
 }