Manual fixups for scoped_refptr operator T* removal in base/

BUG=110610

Review URL: https://codereview.chromium.org/511153002

Cr-Commit-Position: refs/heads/master@{#292429}

6 files changed, 28 insertions, 20 deletions

diff --git a/base/files/important_file_writer.cc b/base/files/important_file_writer.cc
index 4a03780..c996da2 100644
--- a/base/files/important_file_writer.cc
+++ b/base/files/important_file_writer.cc
@@ -88,8 +88,9 @@ bool ImportantFileWriter::WriteFileAtomically(const FilePath& path,
   return true;
 }
 
-ImportantFileWriter::ImportantFileWriter(const FilePath& path,
-                                         base::SequencedTaskRunner* task_runner)
+ImportantFileWriter::ImportantFileWriter(
+    const FilePath& path,
+    const scoped_refptr<base::SequencedTaskRunner>& task_runner)
     : path_(path),
       task_runner_(task_runner),
       serializer_(NULL),
diff --git a/base/files/important_file_writer.h b/base/files/important_file_writer.h
index 61a53b1..9ead9c1 100644
--- a/base/files/important_file_writer.h
+++ b/base/files/important_file_writer.h
@@ -62,8 +62,9 @@ class BASE_EXPORT ImportantFileWriter : public NonThreadSafe {
   // |task_runner| is the SequencedTaskRunner instance where on which we will
   // execute file I/O operations.
   // All non-const methods, ctor and dtor must be called on the same thread.
-  ImportantFileWriter(const FilePath& path,
-                      base::SequencedTaskRunner* task_runner);
+  ImportantFileWriter(
+      const FilePath& path,
+      const scoped_refptr<base::SequencedTaskRunner>& task_runner);
 
   // You have to ensure that there are no pending writes at the moment
   // of destruction.
diff --git a/base/prefs/json_pref_store.cc b/base/prefs/json_pref_store.cc
index 2426ffe..d471403 100644
--- a/base/prefs/json_pref_store.cc
+++ b/base/prefs/json_pref_store.cc
@@ -124,9 +124,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()),
@@ -138,10 +139,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),
diff --git a/base/prefs/json_pref_store.h b/base/prefs/json_pref_store.h
index 6df9e23..7f26c89 100644
--- a/base/prefs/json_pref_store.h
+++ b/base/prefs/json_pref_store.h
@@ -47,9 +47,10 @@ class BASE_PREFS_EXPORT JsonPrefStore
       base::SequencedWorkerPool* worker_pool);
 
   // Same as the constructor below with no alternate filename.
-  JsonPrefStore(const base::FilePath& pref_filename,
-                base::SequencedTaskRunner* sequenced_task_runner,
-                scoped_ptr<PrefFilter> pref_filter);
+  JsonPrefStore(
+      const base::FilePath& pref_filename,
+      const scoped_refptr<base::SequencedTaskRunner>& sequenced_task_runner,
+      scoped_ptr<PrefFilter> pref_filter);
 
   // |sequenced_task_runner| must be a shutdown-blocking task runner, ideally
   // created by the GetTaskRunnerForFile() method above.
@@ -58,10 +59,11 @@ class BASE_PREFS_EXPORT JsonPrefStore
   // desired prefs may have previously been written to. If |pref_filename|
   // doesn't exist and |pref_alternate_filename| does, |pref_alternate_filename|
   // will be moved to |pref_filename| before the read occurs.
-  JsonPrefStore(const base::FilePath& pref_filename,
-                const base::FilePath& pref_alternate_filename,
-                base::SequencedTaskRunner* sequenced_task_runner,
-                scoped_ptr<PrefFilter> pref_filter);
+  JsonPrefStore(
+      const base::FilePath& pref_filename,
+      const base::FilePath& pref_alternate_filename,
+      const scoped_refptr<base::SequencedTaskRunner>& sequenced_task_runner,
+      scoped_ptr<PrefFilter> pref_filter);
 
   // PrefStore overrides:
   virtual bool GetValue(const std::string& key,
diff --git a/base/test/thread_test_helper.cc b/base/test/thread_test_helper.cc
index a91517d..2bd3ba5 100644
--- a/base/test/thread_test_helper.cc
+++ b/base/test/thread_test_helper.cc
@@ -10,7 +10,8 @@
 
 namespace base {
 
-ThreadTestHelper::ThreadTestHelper(MessageLoopProxy* target_thread)
+ThreadTestHelper::ThreadTestHelper(
+    const scoped_refptr<MessageLoopProxy>& target_thread)
     : test_result_(false),
       target_thread_(target_thread),
       done_event_(false, false) {
diff --git a/base/test/thread_test_helper.h b/base/test/thread_test_helper.h
index 9521de6..f6817b5 100644
--- a/base/test/thread_test_helper.h
+++ b/base/test/thread_test_helper.h
@@ -18,7 +18,8 @@ namespace base {
 // until all pending tasks on a given thread have been executed.
 class ThreadTestHelper : public RefCountedThreadSafe<ThreadTestHelper> {
  public:
-  explicit ThreadTestHelper(MessageLoopProxy* target_thread);
+  explicit ThreadTestHelper(
+      const scoped_refptr<MessageLoopProxy>& target_thread);
 
   // True if RunTest() was successfully executed on the target thread.
   bool Run() WARN_UNUSED_RESULT;