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..7821123a91e3078d8caab2dfb25f3bf71e80e1d0 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 SequencedTaskRunner;
 class Value;
 }
 
@@ -28,10 +29,19 @@ 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);
+  // Returns instance of SequencedTaskRunner which guarantees that file
+  // operations on the same file will be executed in sequenced order.
+  static scoped_refptr<base::SequencedTaskRunner> GetTaskRunnerForFile(

[akalin, 2012/10/19 23:12:21]

as discussed, please make this return a raw pointer

[zel, 2012/10/21 20:03:19]

Done.

+      const FilePath& pref_filename,
+      base::SequencedWorkerPool* worker_pool);
+
+  // Creates an instance JsonPrefStore for a given |pref_filename| that will
+  // perform all file I/O operations on |sequenced_task_runner|.
+  // |sequenced_task_runner| must be a shutdown-blocking task runner, ideally
+  // created by GetTaskRunnerForFile() method above.
+  static JsonPrefStore* Create(
+      const FilePath& pref_filename,
+      base::SequencedTaskRunner* sequenced_task_runner);
 
   // PrefStore overrides:
   virtual ReadResult GetValue(const std::string& key,
@@ -63,13 +73,17 @@ class JsonPrefStore : public PersistentPrefStore,
   void OnFileRead(base::Value* value_owned, PrefReadError error, bool no_dir);
 
  private:
+  // |sequenced_task_runner| is a SequencedTaskRunner on which file I/O can

[akalin, 2012/10/19 23:12:21]

remove 'can'

[zel, 2012/10/21 20:03:19]

As I explained, that would be either cause a crash (confirmed in tests) or we
also need to change declaration of:

scoped_refptr<SequencedTaskRunner>
SequencedWorkerPool::GetSequencedTaskRunnerWithShutdownBehavior()

+  // will be run.
+  JsonPrefStore(const FilePath& pref_filename,
+                base::SequencedTaskRunner* sequenced_task_runner);
   virtual ~JsonPrefStore();
 
   // ImportantFileWriter::DataSerializer overrides:
   virtual bool SerializeData(std::string* output) OVERRIDE;
 
   FilePath path_;
-  scoped_refptr<base::MessageLoopProxy> file_message_loop_proxy_;
+  const scoped_refptr<base::SequencedTaskRunner> sequenced_task_runner_;
 
   scoped_ptr<base::DictionaryValue> prefs_;