FileAPI/sync file system cleanups for scoped_refptr operator T* cleanup.

BUG=110610

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

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

29 files changed, 118 insertions, 103 deletions

diff --git a/chrome/browser/sync_file_system/drive_backend/callback_helper.h b/chrome/browser/sync_file_system/drive_backend/callback_helper.h
index bce3377..3fd3f41 100644
--- a/chrome/browser/sync_file_system/drive_backend/callback_helper.h
+++ b/chrome/browser/sync_file_system/drive_backend/callback_helper.h
@@ -42,7 +42,7 @@ RebindForward(T& t) {
 template <typename T>
 class CallbackHolder {
  public:
-  CallbackHolder(base::SequencedTaskRunner* task_runner,
+  CallbackHolder(const scoped_refptr<base::SequencedTaskRunner>& task_runner,
                  const tracked_objects::Location& from_here,
                  const base::Callback<T>& callback)
       : task_runner_(task_runner),
@@ -156,7 +156,7 @@ struct RelayToTaskRunnerHelper<void(A1, A2, A3, A4, A5, A6, A7)> {
 
 template <typename T>
 base::Callback<T> RelayCallbackToTaskRunner(
-    base::SequencedTaskRunner* task_runner,
+    const scoped_refptr<base::SequencedTaskRunner>& task_runner,
     const tracked_objects::Location& from_here,
     const base::Callback<T>& callback) {
   DCHECK(task_runner->RunsTasksOnCurrentThread());
diff --git a/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc b/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
index 1bec9ca..99b6ee5 100644
--- a/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
@@ -31,6 +31,7 @@
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "extensions/common/extension.h"
 #include "google_apis/drive/drive_api_parser.h"
+#include "net/url_request/url_request_context_getter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/leveldatabase/src/helpers/memenv/memenv.h"
 #include "third_party/leveldatabase/src/include/leveldb/env.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
index 60ea133..5456f52 100644
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
@@ -524,20 +524,21 @@ struct MetadataDatabase::CreateParam {
   base::FilePath database_path;
   leveldb::Env* env_override;
 
-  CreateParam(base::SequencedTaskRunner* worker_task_runner,
-              const base::FilePath& database_path,
-              leveldb::Env* env_override)
+  CreateParam(
+      const scoped_refptr<base::SequencedTaskRunner>& worker_task_runner,
+      const base::FilePath& database_path,
+      leveldb::Env* env_override)
       : worker_task_runner(worker_task_runner),
         database_path(database_path),
-        env_override(env_override) {
-  }
+        env_override(env_override) {}
 };
 
 // static
-void MetadataDatabase::Create(base::SequencedTaskRunner* worker_task_runner,
-                              const base::FilePath& database_path,
-                              leveldb::Env* env_override,
-                              const CreateCallback& callback) {
+void MetadataDatabase::Create(
+    const scoped_refptr<base::SequencedTaskRunner>& worker_task_runner,
+    const base::FilePath& database_path,
+    leveldb::Env* env_override,
+    const CreateCallback& callback) {
   worker_task_runner->PostTask(FROM_HERE, base::Bind(
       &MetadataDatabase::CreateOnWorkerTaskRunner,
       base::Passed(make_scoped_ptr(new CreateParam(
@@ -1402,7 +1403,7 @@ void MetadataDatabase::SweepDirtyTrackers(
 }
 
 MetadataDatabase::MetadataDatabase(
-    base::SequencedTaskRunner* worker_task_runner,
+    const scoped_refptr<base::SequencedTaskRunner>& worker_task_runner,
     const base::FilePath& database_path,
     leveldb::Env* env_override)
     : worker_task_runner_(worker_task_runner),
@@ -1410,7 +1411,7 @@ MetadataDatabase::MetadataDatabase(
       env_override_(env_override),
       largest_known_change_id_(0),
       weak_ptr_factory_(this) {
-  DCHECK(worker_task_runner);
+  DCHECK(worker_task_runner.get());
 }
 
 // static
@@ -1420,7 +1421,7 @@ void MetadataDatabase::CreateOnWorkerTaskRunner(
   DCHECK(create_param->worker_task_runner->RunsTasksOnCurrentThread());
 
   scoped_ptr<MetadataDatabase> metadata_database(
-      new MetadataDatabase(create_param->worker_task_runner.get(),
+      new MetadataDatabase(create_param->worker_task_runner,
                            create_param->database_path,
                            create_param->env_override));
   SyncStatusCode status = metadata_database->Initialize();
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database.h b/chrome/browser/sync_file_system/drive_backend/metadata_database.h
index f7caca9..99e967b 100644
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database.h
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database.h
@@ -132,10 +132,11 @@ class MetadataDatabase {
   // If |env_override| is non-NULL, internal LevelDB uses |env_override| instead
   // of leveldb::Env::Default().  Use leveldb::MemEnv in test code for faster
   // testing.
-  static void Create(base::SequencedTaskRunner* worker_task_runner,
-                     const base::FilePath& database_path,
-                     leveldb::Env* env_override,
-                     const CreateCallback& callback);
+  static void Create(
+      const scoped_refptr<base::SequencedTaskRunner>& worker_task_runner,
+      const base::FilePath& database_path,
+      leveldb::Env* env_override,
+      const CreateCallback& callback);
   static SyncStatusCode CreateForTesting(
       scoped_ptr<LevelDBWrapper> db,
       scoped_ptr<MetadataDatabase>* metadata_database_out);
@@ -354,9 +355,10 @@ class MetadataDatabase {
   friend class MetadataDatabaseTest;
   struct CreateParam;
 
-  MetadataDatabase(base::SequencedTaskRunner* worker_task_runner,
-                   const base::FilePath& database_path,
-                   leveldb::Env* env_override);
+  MetadataDatabase(
+      const scoped_refptr<base::SequencedTaskRunner>& worker_task_runner,
+      const base::FilePath& database_path,
+      leveldb::Env* env_override);
   static void CreateOnWorkerTaskRunner(
       scoped_ptr<CreateParam> create_param,
       const CreateCallback& callback);
diff --git a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.cc b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.cc
index 0518b73..90d4d1e 100644
--- a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.cc
+++ b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.cc
@@ -79,7 +79,8 @@ scoped_ptr<FileMetadata> GetFileMetadata(MetadataDatabase* database,
 
 // Creates a temporary file in |dir_path|.  This must be called on an
 // IO-allowed task runner, and the runner must be given as |file_task_runner|.
-storage::ScopedFile CreateTemporaryFile(base::TaskRunner* file_task_runner) {
+storage::ScopedFile CreateTemporaryFile(
+    const scoped_refptr<base::TaskRunner>& file_task_runner) {
   base::FilePath temp_file_path;
   if (!base::CreateTemporaryFile(&temp_file_path))
     return storage::ScopedFile();
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc
index 84a2ed54..f5ea2a9 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc
@@ -714,16 +714,16 @@ void SyncEngine::GoogleSignedOut(const std::string& username) {
 }
 
 SyncEngine::SyncEngine(
-    base::SingleThreadTaskRunner* ui_task_runner,
-    base::SequencedTaskRunner* worker_task_runner,
-    base::SequencedTaskRunner* drive_task_runner,
+    const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner,
+    const scoped_refptr<base::SequencedTaskRunner>& worker_task_runner,
+    const scoped_refptr<base::SequencedTaskRunner>& drive_task_runner,
     const base::FilePath& sync_file_system_dir,
     TaskLogger* task_logger,
     drive::DriveNotificationManager* notification_manager,
     ExtensionServiceInterface* extension_service,
     SigninManagerBase* signin_manager,
     OAuth2TokenService* token_service,
-    net::URLRequestContextGetter* request_context,
+    const scoped_refptr<net::URLRequestContextGetter>& request_context,
     scoped_ptr<DriveServiceFactory> drive_service_factory,
     leveldb::Env* env_override)
     : ui_task_runner_(ui_task_runner),
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine.h b/chrome/browser/sync_file_system/drive_backend/sync_engine.h
index eb628d8..29568c6 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine.h
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine.h
@@ -158,16 +158,16 @@ class SyncEngine : public RemoteFileSyncService,
   friend class DriveBackendSyncTest;
   friend class SyncEngineTest;
 
-  SyncEngine(base::SingleThreadTaskRunner* ui_task_runner,
-             base::SequencedTaskRunner* worker_task_runner,
-             base::SequencedTaskRunner* drive_task_runner,
+  SyncEngine(const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner,
+             const scoped_refptr<base::SequencedTaskRunner>& worker_task_runner,
+             const scoped_refptr<base::SequencedTaskRunner>& drive_task_runner,
              const base::FilePath& sync_file_system_dir,
              TaskLogger* task_logger,
              drive::DriveNotificationManager* notification_manager,
              ExtensionServiceInterface* extension_service,
              SigninManagerBase* signin_manager,
              OAuth2TokenService* token_service,
-             net::URLRequestContextGetter* request_context,
+             const scoped_refptr<net::URLRequestContextGetter>& request_context,
              scoped_ptr<DriveServiceFactory> drive_service_factory,
              leveldb::Env* env_override);
 
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_context.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine_context.cc
index 0e13d13..f1743d8 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine_context.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_context.cc
@@ -22,13 +22,12 @@ SyncEngineContext::SyncEngineContext(
     scoped_ptr<drive::DriveServiceInterface> drive_service,
     scoped_ptr<drive::DriveUploaderInterface> drive_uploader,
     TaskLogger* task_logger,
-    base::SingleThreadTaskRunner* ui_task_runner,
-    base::SequencedTaskRunner* worker_task_runner)
+    const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner,
+    const scoped_refptr<base::SequencedTaskRunner>& worker_task_runner)
     : drive_service_(drive_service.Pass()),
       drive_uploader_(drive_uploader.Pass()),
-      task_logger_(task_logger
-                   ? task_logger->AsWeakPtr()
-                   : base::WeakPtr<TaskLogger>()),
+      task_logger_(task_logger ? task_logger->AsWeakPtr()
+                               : base::WeakPtr<TaskLogger>()),
       remote_change_processor_(NULL),
       ui_task_runner_(ui_task_runner),
       worker_task_runner_(worker_task_runner) {
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_context.h b/chrome/browser/sync_file_system/drive_backend/sync_engine_context.h
index 8b63633..ee1d4cd 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine_context.h
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_context.h
@@ -36,8 +36,8 @@ class SyncEngineContext {
       scoped_ptr<drive::DriveServiceInterface> drive_service,
       scoped_ptr<drive::DriveUploaderInterface> drive_uploader,
       TaskLogger* task_logger,
-      base::SingleThreadTaskRunner* ui_task_runner,
-      base::SequencedTaskRunner* worker_task_runner);
+      const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner,
+      const scoped_refptr<base::SequencedTaskRunner>& worker_task_runner);
   ~SyncEngineContext();
 
   void SetMetadataDatabase(scoped_ptr<MetadataDatabase> metadata_database);
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc
index 5a739e9..65b2cc5 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc
@@ -17,6 +17,7 @@
 #include "chrome/browser/sync_file_system/sync_file_system_test_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
+#include "net/url_request/url_request_context_getter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace sync_file_system {
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_task_manager.cc b/chrome/browser/sync_file_system/drive_backend/sync_task_manager.cc
index 6325e79..d0ed6a5 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_task_manager.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_task_manager.cc
@@ -55,7 +55,7 @@ bool SyncTaskManager::PendingTaskComparator::operator()(
 SyncTaskManager::SyncTaskManager(
     base::WeakPtr<Client> client,
     size_t maximum_background_task,
-    base::SequencedTaskRunner* task_runner)
+    const scoped_refptr<base::SequencedTaskRunner>& task_runner)
     : client_(client),
       maximum_background_task_(maximum_background_task),
       pending_task_seq_(0),
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_task_manager.h b/chrome/browser/sync_file_system/drive_backend/sync_task_manager.h
index e9efcd0..4a92a77 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_task_manager.h
+++ b/chrome/browser/sync_file_system/drive_backend/sync_task_manager.h
@@ -70,7 +70,7 @@ class SyncTaskManager : public base::SupportsWeakPtr<SyncTaskManager> {
   // If |maximum_background_tasks| is zero, all task runs as foreground task.
   SyncTaskManager(base::WeakPtr<Client> client,
                   size_t maximum_background_task,
-                  base::SequencedTaskRunner* task_runner);
+                  const scoped_refptr<base::SequencedTaskRunner>& task_runner);
   virtual ~SyncTaskManager();
 
   // This needs to be called to start task scheduling.
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_task_token.cc b/chrome/browser/sync_file_system/drive_backend/sync_task_token.cc
index 624cefc..60c5528 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_task_token.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_task_token.cc
@@ -138,11 +138,12 @@ scoped_ptr<TaskLogger::TaskLog> SyncTaskToken::PassTaskLog() {
   return task_log_.Pass();
 }
 
-SyncTaskToken::SyncTaskToken(const base::WeakPtr<SyncTaskManager>& manager,
-                             base::SequencedTaskRunner* task_runner,
-                             int64 token_id,
-                             scoped_ptr<BlockingFactor> blocking_factor,
-                             const SyncStatusCallback& callback)
+SyncTaskToken::SyncTaskToken(
+    const base::WeakPtr<SyncTaskManager>& manager,
+    const scoped_refptr<base::SequencedTaskRunner>& task_runner,
+    int64 token_id,
+    scoped_ptr<BlockingFactor> blocking_factor,
+    const SyncStatusCallback& callback)
     : manager_(manager),
       task_runner_(task_runner),
       token_id_(token_id),
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_task_token.h b/chrome/browser/sync_file_system/drive_backend/sync_task_token.h
index ae11b69..0fb5323 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_task_token.h
+++ b/chrome/browser/sync_file_system/drive_backend/sync_task_token.h
@@ -66,7 +66,7 @@ class SyncTaskToken {
 
  private:
   SyncTaskToken(const base::WeakPtr<SyncTaskManager>& manager,
-                base::SequencedTaskRunner* task_runner,
+                const scoped_refptr<base::SequencedTaskRunner>& task_runner,
                 int64 token_id,
                 scoped_ptr<BlockingFactor> blocking_factor,
                 const SyncStatusCallback& callback);
diff --git a/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc b/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc
index 29008e5..539ad1f 100644
--- a/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc
+++ b/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc
@@ -209,8 +209,8 @@ void EnsureLastTaskRuns(base::SingleThreadTaskRunner* runner) {
 CannedSyncableFileSystem::CannedSyncableFileSystem(
     const GURL& origin,
     leveldb::Env* env_override,
-    base::SingleThreadTaskRunner* io_task_runner,
-    base::SingleThreadTaskRunner* file_task_runner)
+    const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner,
+    const scoped_refptr<base::SingleThreadTaskRunner>& file_task_runner)
     : origin_(origin),
       type_(storage::kFileSystemTypeSyncable),
       result_(base::File::FILE_OK),
diff --git a/chrome/browser/sync_file_system/local/canned_syncable_file_system.h b/chrome/browser/sync_file_system/local/canned_syncable_file_system.h
index 1616ec1..83b6583 100644
--- a/chrome/browser/sync_file_system/local/canned_syncable_file_system.h
+++ b/chrome/browser/sync_file_system/local/canned_syncable_file_system.h
@@ -70,10 +70,11 @@ class CannedSyncableFileSystem
     QUOTA_DISABLED,
   };
 
-  CannedSyncableFileSystem(const GURL& origin,
-                           leveldb::Env* env_override,
-                           base::SingleThreadTaskRunner* io_task_runner,
-                           base::SingleThreadTaskRunner* file_task_runner);
+  CannedSyncableFileSystem(
+      const GURL& origin,
+      leveldb::Env* env_override,
+      const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner,
+      const scoped_refptr<base::SingleThreadTaskRunner>& file_task_runner);
   virtual ~CannedSyncableFileSystem();
 
   // SetUp must be called before using this instance.
diff --git a/content/browser/fileapi/fileapi_message_filter.cc b/content/browser/fileapi/fileapi_message_filter.cc
index 09f81c3..1ebac52 100644
--- a/content/browser/fileapi/fileapi_message_filter.cc
+++ b/content/browser/fileapi/fileapi_message_filter.cc
@@ -672,7 +672,7 @@ void FileAPIMessageFilter::OnCloneStream(
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   // Abort if there's no Stream instance for |src_url| (source Stream which
   // we're going to make |url| point to) in the registry.
-  if (!GetStreamForURL(src_url))
+  if (!GetStreamForURL(src_url).get())
     return;
 
   stream_context_->registry()->CloneStream(url, src_url);
diff --git a/content/browser/quota/mock_quota_manager.cc b/content/browser/quota/mock_quota_manager.cc
index 39cd1f2..4884d0d 100644
--- a/content/browser/quota/mock_quota_manager.cc
+++ b/content/browser/quota/mock_quota_manager.cc
@@ -33,11 +33,14 @@ MockQuotaManager::StorageInfo::~StorageInfo() {}
 MockQuotaManager::MockQuotaManager(
     bool is_incognito,
     const base::FilePath& profile_path,
-    base::SingleThreadTaskRunner* io_thread,
-    base::SequencedTaskRunner* db_thread,
-    SpecialStoragePolicy* special_storage_policy)
-    : QuotaManager(is_incognito, profile_path, io_thread, db_thread,
-        special_storage_policy),
+    const scoped_refptr<base::SingleThreadTaskRunner>& io_thread,
+    const scoped_refptr<base::SequencedTaskRunner>& db_thread,
+    const scoped_refptr<SpecialStoragePolicy>& special_storage_policy)
+    : QuotaManager(is_incognito,
+                   profile_path,
+                   io_thread,
+                   db_thread,
+                   special_storage_policy),
       weak_factory_(this) {
 }
 
diff --git a/content/browser/quota/mock_quota_manager.h b/content/browser/quota/mock_quota_manager.h
index c993b96..1776f01 100644
--- a/content/browser/quota/mock_quota_manager.h
+++ b/content/browser/quota/mock_quota_manager.h
@@ -40,11 +40,12 @@ namespace content {
 // origin data stored in the profile.
 class MockQuotaManager : public QuotaManager {
  public:
-  MockQuotaManager(bool is_incognito,
-                   const base::FilePath& profile_path,
-                   base::SingleThreadTaskRunner* io_thread,
-                   base::SequencedTaskRunner* db_thread,
-                   SpecialStoragePolicy* special_storage_policy);
+  MockQuotaManager(
+      bool is_incognito,
+      const base::FilePath& profile_path,
+      const scoped_refptr<base::SingleThreadTaskRunner>& io_thread,
+      const scoped_refptr<base::SequencedTaskRunner>& db_thread,
+      const scoped_refptr<SpecialStoragePolicy>& special_storage_policy);
 
   // Overrides QuotaManager's implementation. The internal usage data is
   // updated when MockQuotaManagerProxy::NotifyStorageModified() is
diff --git a/webkit/browser/blob/blob_url_request_job.cc b/webkit/browser/blob/blob_url_request_job.cc
index c4725a3..9eb196a 100644
--- a/webkit/browser/blob/blob_url_request_job.cc
+++ b/webkit/browser/blob/blob_url_request_job.cc
@@ -49,7 +49,7 @@ bool IsFileType(BlobData::Item::Type type) {
 BlobURLRequestJob::BlobURLRequestJob(
     net::URLRequest* request,
     net::NetworkDelegate* network_delegate,
-    BlobData* blob_data,
+    const scoped_refptr<BlobData>& blob_data,
     storage::FileSystemContext* file_system_context,
     base::MessageLoopProxy* file_thread_proxy)
     : net::URLRequestJob(request, network_delegate),
diff --git a/webkit/browser/blob/blob_url_request_job.h b/webkit/browser/blob/blob_url_request_job.h
index c41c368..ca80583 100644
--- a/webkit/browser/blob/blob_url_request_job.h
+++ b/webkit/browser/blob/blob_url_request_job.h
@@ -38,7 +38,7 @@ class STORAGE_EXPORT BlobURLRequestJob
  public:
   BlobURLRequestJob(net::URLRequest* request,
                     net::NetworkDelegate* network_delegate,
-                    BlobData* blob_data,
+                    const scoped_refptr<BlobData>& blob_data,
                     storage::FileSystemContext* file_system_context,
                     base::MessageLoopProxy* resolving_message_loop_proxy);
 
diff --git a/webkit/browser/blob/blob_url_request_job_factory.cc b/webkit/browser/blob/blob_url_request_job_factory.cc
index a4521ae..d95f150 100644
--- a/webkit/browser/blob/blob_url_request_job_factory.cc
+++ b/webkit/browser/blob/blob_url_request_job_factory.cc
@@ -50,7 +50,7 @@ void BlobProtocolHandler::SetRequestedBlobDataHandle(
 BlobProtocolHandler::BlobProtocolHandler(
     BlobStorageContext* context,
     storage::FileSystemContext* file_system_context,
-    base::MessageLoopProxy* loop_proxy)
+    const scoped_refptr<base::MessageLoopProxy>& loop_proxy)
     : file_system_context_(file_system_context), file_loop_proxy_(loop_proxy) {
   if (context)
     context_ = context->AsWeakPtr();
diff --git a/webkit/browser/blob/blob_url_request_job_factory.h b/webkit/browser/blob/blob_url_request_job_factory.h
index 08d1844..6721f00 100644
--- a/webkit/browser/blob/blob_url_request_job_factory.h
+++ b/webkit/browser/blob/blob_url_request_job_factory.h
@@ -45,9 +45,10 @@ class STORAGE_EXPORT BlobProtocolHandler
       net::URLRequest* request,
       scoped_ptr<BlobDataHandle> blob_data_handle);
 
-  BlobProtocolHandler(BlobStorageContext* context,
-                      storage::FileSystemContext* file_system_context,
-                      base::MessageLoopProxy* file_loop_proxy);
+  BlobProtocolHandler(
+      BlobStorageContext* context,
+      storage::FileSystemContext* file_system_context,
+      const scoped_refptr<base::MessageLoopProxy>& file_loop_proxy);
   virtual ~BlobProtocolHandler();
 
   virtual net::URLRequestJob* MaybeCreateJob(
diff --git a/webkit/browser/quota/quota_manager.cc b/webkit/browser/quota/quota_manager.cc
index 0193787..75a0e43 100644
--- a/webkit/browser/quota/quota_manager.cc
+++ b/webkit/browser/quota/quota_manager.cc
@@ -797,26 +797,26 @@ class QuotaManager::DumpOriginInfoTableHelper {
 
 // QuotaManager ---------------------------------------------------------------
 
-QuotaManager::QuotaManager(bool is_incognito,
-                           const base::FilePath& profile_path,
-                           base::SingleThreadTaskRunner* io_thread,
-                           base::SequencedTaskRunner* db_thread,
-                           SpecialStoragePolicy* special_storage_policy)
-  : is_incognito_(is_incognito),
-    profile_path_(profile_path),
-    proxy_(new QuotaManagerProxy(
-        this, io_thread)),
-    db_disabled_(false),
-    eviction_disabled_(false),
-    io_thread_(io_thread),
-    db_thread_(db_thread),
-    temporary_quota_initialized_(false),
-    temporary_quota_override_(-1),
-    desired_available_space_(-1),
-    special_storage_policy_(special_storage_policy),
-    get_disk_space_fn_(&CallSystemGetAmountOfFreeDiskSpace),
-    storage_monitor_(new StorageMonitor(this)),
-    weak_factory_(this) {
+QuotaManager::QuotaManager(
+    bool is_incognito,
+    const base::FilePath& profile_path,
+    const scoped_refptr<base::SingleThreadTaskRunner>& io_thread,
+    const scoped_refptr<base::SequencedTaskRunner>& db_thread,
+    const scoped_refptr<SpecialStoragePolicy>& special_storage_policy)
+    : is_incognito_(is_incognito),
+      profile_path_(profile_path),
+      proxy_(new QuotaManagerProxy(this, io_thread)),
+      db_disabled_(false),
+      eviction_disabled_(false),
+      io_thread_(io_thread),
+      db_thread_(db_thread),
+      temporary_quota_initialized_(false),
+      temporary_quota_override_(-1),
+      desired_available_space_(-1),
+      special_storage_policy_(special_storage_policy),
+      get_disk_space_fn_(&CallSystemGetAmountOfFreeDiskSpace),
+      storage_monitor_(new StorageMonitor(this)),
+      weak_factory_(this) {
 }
 
 void QuotaManager::GetUsageInfo(const GetUsageInfoCallback& callback) {
diff --git a/webkit/browser/quota/quota_manager.h b/webkit/browser/quota/quota_manager.h
index 989dc3a..e641b3c 100644
--- a/webkit/browser/quota/quota_manager.h
+++ b/webkit/browser/quota/quota_manager.h
@@ -122,11 +122,12 @@ class STORAGE_EXPORT QuotaManager
   static const int64 kIncognitoDefaultQuotaLimit;
   static const int64 kNoLimit;
 
-  QuotaManager(bool is_incognito,
-               const base::FilePath& profile_path,
-               base::SingleThreadTaskRunner* io_thread,
-               base::SequencedTaskRunner* db_thread,
-               SpecialStoragePolicy* special_storage_policy);
+  QuotaManager(
+      bool is_incognito,
+      const base::FilePath& profile_path,
+      const scoped_refptr<base::SingleThreadTaskRunner>& io_thread,
+      const scoped_refptr<base::SequencedTaskRunner>& db_thread,
+      const scoped_refptr<SpecialStoragePolicy>& special_storage_policy);
 
   // Returns a proxy object that can be used on any thread.
   QuotaManagerProxy* proxy() { return proxy_.get(); }
diff --git a/webkit/browser/quota/quota_manager_proxy.cc b/webkit/browser/quota/quota_manager_proxy.cc
index 7cc39c7..499535e 100644
--- a/webkit/browser/quota/quota_manager_proxy.cc
+++ b/webkit/browser/quota/quota_manager_proxy.cc
@@ -150,7 +150,8 @@ QuotaManager* QuotaManagerProxy::quota_manager() const {
 }
 
 QuotaManagerProxy::QuotaManagerProxy(
-    QuotaManager* manager, base::SingleThreadTaskRunner* io_thread)
+    QuotaManager* manager,
+    const scoped_refptr<base::SingleThreadTaskRunner>& io_thread)
     : manager_(manager), io_thread_(io_thread) {
 }
 
diff --git a/webkit/browser/quota/quota_manager_proxy.h b/webkit/browser/quota/quota_manager_proxy.h
index e9c6672..a1d38a8 100644
--- a/webkit/browser/quota/quota_manager_proxy.h
+++ b/webkit/browser/quota/quota_manager_proxy.h
@@ -63,8 +63,9 @@ class STORAGE_EXPORT QuotaManagerProxy
   friend class QuotaManager;
   friend class base::RefCountedThreadSafe<QuotaManagerProxy>;
 
-  QuotaManagerProxy(QuotaManager* manager,
-                    base::SingleThreadTaskRunner* io_thread);
+  QuotaManagerProxy(
+      QuotaManager* manager,
+      const scoped_refptr<base::SingleThreadTaskRunner>& io_thread);
   virtual ~QuotaManagerProxy();
 
   QuotaManager* manager_;  // only accessed on the io thread
diff --git a/webkit/common/blob/scoped_file.cc b/webkit/common/blob/scoped_file.cc
index 12edd6e..19e68e1 100644
--- a/webkit/common/blob/scoped_file.cc
+++ b/webkit/common/blob/scoped_file.cc
@@ -17,15 +17,15 @@ ScopedFile::ScopedFile()
     : scope_out_policy_(DONT_DELETE_ON_SCOPE_OUT) {
 }
 
-ScopedFile::ScopedFile(
-    const base::FilePath& path, ScopeOutPolicy policy,
-    base::TaskRunner* file_task_runner)
+ScopedFile::ScopedFile(const base::FilePath& path,
+                       ScopeOutPolicy policy,
+                       const scoped_refptr<base::TaskRunner>& file_task_runner)
     : path_(path),
       scope_out_policy_(policy),
       file_task_runner_(file_task_runner) {
-  DCHECK(path.empty() || policy != DELETE_ON_SCOPE_OUT || file_task_runner)
-      << "path:" << path.value()
-      << " policy:" << policy
+  DCHECK(path.empty() || policy != DELETE_ON_SCOPE_OUT ||
+         file_task_runner.get())
+      << "path:" << path.value() << " policy:" << policy
       << " runner:" << file_task_runner;
 }
 
diff --git a/webkit/common/blob/scoped_file.h b/webkit/common/blob/scoped_file.h
index cd12323..a435725 100644
--- a/webkit/common/blob/scoped_file.h
+++ b/webkit/common/blob/scoped_file.h
@@ -49,7 +49,7 @@ class WEBKIT_STORAGE_COMMON_EXPORT ScopedFile {
   // is DELETE_ON_SCOPE_OUT.
   ScopedFile(const base::FilePath& path,
              ScopeOutPolicy policy,
-             base::TaskRunner* file_task_runner);
+             const scoped_refptr<base::TaskRunner>& file_task_runner);
 
   // Move constructor and operator. The data of r-value will be transfered
   // in a destructive way. (See base/move.h)