Moved JsonPrefStore to use SequencedWorkerPool

chrome/common/json_pref_store.h

Index: chrome/common/json_pref_store.h
diff --git a/chrome/common/json_pref_store.h b/chrome/common/json_pref_store.h
index 7ceb7dad2ac0c472e51a1405e58861e6fd6ad93a..a9a61be7cc23c49f54fe2e31c61706d6d008cfdd 100644
--- a/chrome/common/json_pref_store.h
+++ b/chrome/common/json_pref_store.h
@@ -18,7 +18,8 @@
 
 namespace base {
 class DictionaryValue;
-class MessageLoopProxy;
+class SequencedWorkerPool;
+class TaskRunner;
 class Value;
 }
 
@@ -28,10 +29,15 @@ class FilePath;
 class JsonPrefStore : public PersistentPrefStore,
                       public ImportantFileWriter::DataSerializer {
  public:
-  // |file_message_loop_proxy| is the MessageLoopProxy for a thread on which
-  // file I/O can be done.
-  JsonPrefStore(const FilePath& pref_filename,
-                base::MessageLoopProxy* file_message_loop_proxy);
+  // |worker_pool| is the SequencedWorkerPool on which file I/O can be done.
+  // The worker pool will also ensure that write requests for the same file are
+  // sequenced properly and that such request block shutdown.
+  static JsonPrefStore* Create(const FilePath& pref_filename,
+                               base::SequencedWorkerPool* worker_pool);
+
+  // |task_runner| is the TaskRunner for a thread on which file I/O can be done.
+  static JsonPrefStore* Create(const FilePath& pref_filename,
+                               base::TaskRunner* task_runner);
 
   // PrefStore overrides:
   virtual ReadResult GetValue(const std::string& key,
@@ -63,13 +69,16 @@ class JsonPrefStore : public PersistentPrefStore,
   void OnFileRead(base::Value* value_owned, PrefReadError error, bool no_dir);
 
  private:
+  // |task_runner| is the TaskRunner for a thread on which file I/O can be done.
+  JsonPrefStore(const FilePath& pref_filename,
+                base::TaskRunner* task_runner);
   virtual ~JsonPrefStore();
 
   // ImportantFileWriter::DataSerializer overrides:
   virtual bool SerializeData(std::string* output) OVERRIDE;
 
   FilePath path_;
-  scoped_refptr<base::MessageLoopProxy> file_message_loop_proxy_;
+  scoped_refptr<base::TaskRunner> task_runner_;
 
   scoped_ptr<base::DictionaryValue> prefs_;