Integrate registry_hash_store_contents with the rest of tracked prefs.

components/prefs/json_pref_store.cc

 // Copyright (c) 2012 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/prefs/json_pref_store.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
@@ skipping 308 matching lines @@
   DCHECK(CalledOnValidThread());
 
   if (pref_filter_)
     pref_filter_->FilterUpdate(key);
 
   FOR_EACH_OBSERVER(PrefStore::Observer, observers_, OnPrefValueChanged(key));
 
   ScheduleWrite(flags);
 }
 
 void JsonPrefStore::RunOrScheduleNextSuccessfulWriteCallback(

[gab, 2016/09/21 17:55:30]

Note for future patch sets : always upload a separate patch set for merges, it
makes the diff to this specific CL easier to review.

[proberge, 2016/09/21 21:09:25]

Acknowledged.

     bool write_success) {
   DCHECK(CalledOnValidThread());
 
   has_pending_write_callback_ = false;
   if (has_pending_successful_write_reply_) {
     has_pending_successful_write_reply_ = false;
     if (write_success) {
       on_next_successful_write_reply_.Run();
     } else {
       RegisterOnNextSuccessfulWriteReply(on_next_successful_write_reply_);
@@ skipping 115 matching lines @@
   CommitPendingWrite();
 }
 
 bool JsonPrefStore::SerializeData(std::string* output) {
   DCHECK(CalledOnValidThread());
 
   pending_lossy_write_ = false;
 
   write_count_histogram_.RecordWriteOccured();
 
-  if (pref_filter_)
-    pref_filter_->FilterSerializeData(prefs_.get());
+  if (pref_filter_) {
+    base::Callback<void(bool)> pref_filter_post_write_callback =
+        pref_filter_->FilterSerializeData(prefs_.get());
+    if (!pref_filter_post_write_callback.is_null())
+      RegisterOnNextWriteSynchronousCallback(pref_filter_post_write_callback);
+  }
 
   JSONStringValueSerializer serializer(output);
   // Not pretty-printing prefs shrinks pref file size by ~30%. To obtain
   // readable prefs for debugging purposes, you can dump your prefs into any
   // command-line or online JSON pretty printing tool.
   serializer.set_pretty_print(false);
   return serializer.Serialize(*prefs_);
 }
 
 void JsonPrefStore::FinalizeFileRead(
@@ skipping 117 matching lines @@
   DCHECK_EQ(31, num_buckets);
 
   // The histogram below is an expansion of the UMA_HISTOGRAM_CUSTOM_COUNTS
   // macro adapted to allow for a dynamically suffixed histogram name.
   // Note: The factory creates and owns the histogram.
   base::HistogramBase* histogram = base::Histogram::FactoryGet(
       histogram_name, min_value, max_value, num_buckets,
       base::HistogramBase::kUmaTargetedHistogramFlag);
   return histogram;
 }