Reduce usage of MessageLoopProxy in base/

base/prefs/json_pref_store.cc

Index: base/prefs/json_pref_store.cc
diff --git a/base/prefs/json_pref_store.cc b/base/prefs/json_pref_store.cc
index 9180984d0e8b9008b288ff846f3eafdd72c24f63..88dc73df3f99afbe6451daca1c7ce10abe29826a 100644
--- a/base/prefs/json_pref_store.cc
+++ b/base/prefs/json_pref_store.cc
@@ -12,9 +12,9 @@
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/memory/ref_counted.h"
-#include "base/message_loop/message_loop_proxy.h"
 #include "base/prefs/pref_filter.h"
 #include "base/sequenced_task_runner.h"
+#include "base/thread_task_runner_handle.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/values.h"
 
@@ -28,18 +28,18 @@ const base::FilePath::CharType* kBadExtension = FILE_PATH_LITERAL("bad");
 class FileThreadDeserializer
     : public base::RefCountedThreadSafe<FileThreadDeserializer> {
  public:
-  FileThreadDeserializer(JsonPrefStore* delegate,
-                         base::SequencedTaskRunner* sequenced_task_runner)
+  FileThreadDeserializer(
+      JsonPrefStore* delegate,
+      const scoped_refptr<base::SequencedTaskRunner>& sequenced_task_runner)
       : no_dir_(false),
         error_(PersistentPrefStore::PREF_READ_ERROR_NONE),
         delegate_(delegate),
         sequenced_task_runner_(sequenced_task_runner),
-        origin_loop_proxy_(base::MessageLoopProxy::current()) {
-  }
+        origin_task_runner_(base::ThreadTaskRunnerHandle::Get()) {}
 
   void Start(const base::FilePath& path,
              const base::FilePath& alternate_path) {
-    DCHECK(origin_loop_proxy_->BelongsToCurrentThread());
+    DCHECK(origin_task_runner_->RunsTasksOnCurrentThread());
     // TODO(gab): This should use PostTaskAndReplyWithResult instead of using
     // the |error_| member to pass data across tasks.
     sequenced_task_runner_->PostTask(
@@ -55,14 +55,14 @@ class FileThreadDeserializer
 
     value_.reset(DoReading(path, alternate_path, &error_, &no_dir_));
 
-    origin_loop_proxy_->PostTask(
+    origin_task_runner_->PostTask(
         FROM_HERE,
         base::Bind(&FileThreadDeserializer::ReportOnOriginThread, this));
   }
 
   // Reports deserialization result on the origin thread.
   void ReportOnOriginThread() {
-    DCHECK(origin_loop_proxy_->BelongsToCurrentThread());
+    DCHECK(origin_task_runner_->RunsTasksOnCurrentThread());
     delegate_->OnFileRead(value_.Pass(), error_, no_dir_);
   }
 
@@ -99,7 +99,7 @@ class FileThreadDeserializer
   scoped_ptr<base::Value> value_;
   const scoped_refptr<JsonPrefStore> delegate_;
   const scoped_refptr<base::SequencedTaskRunner> sequenced_task_runner_;
-  const scoped_refptr<base::MessageLoopProxy> origin_loop_proxy_;
+  const scoped_refptr<base::SequencedTaskRunner> origin_task_runner_;
 };
 
 // static
@@ -161,9 +161,10 @@ scoped_refptr<base::SequencedTaskRunner> JsonPrefStore::GetTaskRunnerForFile(
       base::SequencedWorkerPool::BLOCK_SHUTDOWN);
 }
 
-JsonPrefStore::JsonPrefStore(const base::FilePath& filename,
-                             base::SequencedTaskRunner* sequenced_task_runner,
-                             scoped_ptr<PrefFilter> pref_filter)
+JsonPrefStore::JsonPrefStore(
+    const base::FilePath& filename,
+    const scoped_refptr<base::SequencedTaskRunner>& sequenced_task_runner,
+    scoped_ptr<PrefFilter> pref_filter)
     : path_(filename),
       sequenced_task_runner_(sequenced_task_runner),
       prefs_(new base::DictionaryValue()),
@@ -175,10 +176,11 @@ JsonPrefStore::JsonPrefStore(const base::FilePath& filename,
       read_error_(PREF_READ_ERROR_NONE) {
 }
 
-JsonPrefStore::JsonPrefStore(const base::FilePath& filename,
-                             const base::FilePath& alternate_filename,
-                             base::SequencedTaskRunner* sequenced_task_runner,
-                             scoped_ptr<PrefFilter> pref_filter)
+JsonPrefStore::JsonPrefStore(
+    const base::FilePath& filename,
+    const base::FilePath& alternate_filename,
+    const scoped_refptr<base::SequencedTaskRunner>& sequenced_task_runner,
+    scoped_ptr<PrefFilter> pref_filter)
     : path_(filename),
       alternate_path_(alternate_filename),
       sequenced_task_runner_(sequenced_task_runner),