Moved JsonPrefStore to use SequencedWorkerPool

chrome/common/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 CHROME_COMMON_JSON_PREF_STORE_H_
 #define CHROME_COMMON_JSON_PREF_STORE_H_
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/common/important_file_writer.h"
 #include "chrome/common/persistent_pref_store.h"
 
 namespace base {
 class DictionaryValue;
-class MessageLoopProxy;
+class SequencedWorkerPool;
+class SequencedTaskRunner;
 class Value;
 }
 
 class FilePath;
 
 // A writable PrefStore implementation that is used for user preferences.
 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.

[akalin, 2012/10/10 01:43:16]

request -> requests

[zel, 2012/10/10 23:25:00]

Done.

+  static JsonPrefStore* Create(const FilePath& pref_filename,

[akalin, 2012/10/10 01:43:16]

return scoped_ptr?

+                               base::SequencedWorkerPool* worker_pool);
 
   // PrefStore overrides:
   virtual ReadResult GetValue(const std::string& key,
                               const base::Value** result) const OVERRIDE;
   virtual void AddObserver(PrefStore::Observer* observer) OVERRIDE;
   virtual void RemoveObserver(PrefStore::Observer* observer) OVERRIDE;
   virtual size_t NumberOfObservers() const OVERRIDE;
   virtual bool IsInitializationComplete() const OVERRIDE;
 
   // PersistentPrefStore overrides:
@@ skipping 11 matching lines @@
   virtual void CommitPendingWrite() OVERRIDE;
   virtual void ReportValueChanged(const std::string& key) OVERRIDE;
 
   // This method is called after JSON file has been read. Method takes
   // ownership of the |value| pointer. Note, this method is used with
   // asynchronous file reading, so class exposes it only for the internal needs.
   // (read: do not call it manually).
   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::SequencedTaskRunner* 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::SequencedTaskRunner> task_runner_;

[akalin, 2012/10/10 01:43:16]

make this const

[zel, 2012/10/10 23:25:00]

that's not going to work since we use non-const methods like PostTask()

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

I meant make the pointer const, like:

'const scoped_refptr<base::SequencedTaskRunner> file_task_runner_;'

That's a const pointer to a STR, not a pointer to a const STR, so you should
still be able to call PostTask.

 
   scoped_ptr<base::DictionaryValue> prefs_;
 
   bool read_only_;
 
   // Helper for safely writing pref data.
   ImportantFileWriter writer_;
 
   ObserverList<PrefStore::Observer, true> observers_;
 
   scoped_ptr<ReadErrorDelegate> error_delegate_;
 
   bool initialized_;
   PrefReadError read_error_;
 
   std::set<std::string> keys_need_empty_value_;
 
   DISALLOW_COPY_AND_ASSIGN(JsonPrefStore);
 };
 
 #endif  // CHROME_COMMON_JSON_PREF_STORE_H_