Integrate registry_hash_store_contents with the rest of tracked prefs.

components/prefs/json_pref_store.h

 // 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.
 
 #ifndef COMPONENTS_PREFS_JSON_PREF_STORE_H_
 #define COMPONENTS_PREFS_JSON_PREF_STORE_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 172 matching lines @@
   friend class base::JsonPrefStoreLossyWriteTest;
   friend class base::WriteCallbacksObserver;
 
   ~JsonPrefStore() override;
 
   // If |write_success| is true, runs |on_next_successful_write_|.
   // Otherwise, re-registers |on_next_successful_write_|.
   void RunOrScheduleNextSuccessfulWriteCallback(bool write_success);
 
   // Handles the result of a write with result |write_success|. Runs
-  // |on_next_write| callback on the current thread and posts
-  // |RunOrScheduleNextSuccessfulWriteCallback| on |reply_task_runner|.
+  // |on_next_write_callback| on the current thread and posts
+  // |on_next_write_reply| on |reply_task_runner|.
   static void PostWriteCallback(
+      const base::Callback<void(bool success)>& on_next_write_callback,
       const base::Callback<void(bool success)>& on_next_write_reply,
-      const base::Callback<void(bool success)>& on_next_write_callback,
       scoped_refptr<base::SequencedTaskRunner> reply_task_runner,
       bool write_success);
 
   // Registers the |callbacks| pair to be called once synchronously before and
   // after, respectively, the next write event of |writer_|.
   // Both callbacks must be thread-safe.
   void RegisterOnNextWriteSynchronousCallbacks(OnWriteCallbackPair callbacks);
 
   // This method is called after the JSON file has been read.  It then hands
   // |value| (or an empty dictionary in some read error cases) to the
@@ skipping 37 matching lines @@
 
   std::unique_ptr<ReadErrorDelegate> error_delegate_;
 
   bool initialized_;
   bool filtering_in_progress_;
   bool pending_lossy_write_;
   PrefReadError read_error_;
 
   std::set<std::string> keys_need_empty_value_;
 
-  bool has_pending_successful_write_reply_;
-  bool has_pending_write_callbacks_;
+  bool has_pending_write_reply_ = true;
   base::Closure on_next_successful_write_reply_;
 
   WriteCountHistogram write_count_histogram_;
 
   DISALLOW_COPY_AND_ASSIGN(JsonPrefStore);
 };
 
 #endif  // COMPONENTS_PREFS_JSON_PREF_STORE_H_