Replace MessageLoopProxy usage with ThreadTaskRunnerHandle in chrome/browser/chromeos/drive module.

MessageLoopProxy is deprecated.
This basically does a search and replace of:

MessageLoopProxy::current() -> ThreadTaskRunnerHandle::Get().

MessageLoopProxy -> SingleThreadTaskRunner

BUG=391045

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

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

chrome/browser/chromeos/drive/change_list_loader.cc

@@ -11,6 +11,7 @@
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/synchronization/cancellation_flag.h"
+#include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/drive/change_list_loader_observer.h"
 #include "chrome/browser/chromeos/drive/change_list_processor.h"
@@ -226,7 +227,7 @@ void AboutResourceLoader::GetAboutResource(
   }
 
   if (cached_about_resource_) {
-    base::MessageLoopProxy::current()->PostTask(
+    base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(
             callback,
@@ -461,7 +462,7 @@ void ChangeListLoader::OnChangeListLoadComplete(FileError error) {
   }
 
   for (size_t i = 0; i < pending_load_callback_.size(); ++i) {
-    base::MessageLoopProxy::current()->PostTask(
+    base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(pending_load_callback_[i], error));
   }

chrome/browser/chromeos/drive/change_list_loader_unittest.cc

@@ -9,6 +9,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/run_loop.h"
+#include "base/single_thread_task_runner.h"
+#include "base/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/drive/change_list_loader_observer.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
 #include "chrome/browser/chromeos/drive/file_change.h"
@@ -78,30 +80,31 @@ class ChangeListLoaderTest : public testing::Test {
     drive_service_.reset(new FakeDriveService);
     ASSERT_TRUE(test_util::SetUpTestEntries(drive_service_.get()));
 
-    scheduler_.reset(new JobScheduler(pref_service_.get(),
-                                      logger_.get(),
-                                      drive_service_.get(),
-                                      base::MessageLoopProxy::current().get()));
+    scheduler_.reset(new JobScheduler(
+        pref_service_.get(),
+        logger_.get(),
+        drive_service_.get(),
+        base::ThreadTaskRunnerHandle::Get().get()));
     metadata_storage_.reset(new ResourceMetadataStorage(
-        temp_dir_.path(), base::MessageLoopProxy::current().get()));
+        temp_dir_.path(), base::ThreadTaskRunnerHandle::Get().get()));
     ASSERT_TRUE(metadata_storage_->Initialize());
 
     cache_.reset(new FileCache(metadata_storage_.get(),
                                temp_dir_.path(),
-                               base::MessageLoopProxy::current().get(),
+                               base::ThreadTaskRunnerHandle::Get().get(),
                                NULL /* free_disk_space_getter */));
     ASSERT_TRUE(cache_->Initialize());
 
     metadata_.reset(new ResourceMetadata(
         metadata_storage_.get(), cache_.get(),
-        base::MessageLoopProxy::current().get()));
+        base::ThreadTaskRunnerHandle::Get().get()));
     ASSERT_EQ(FILE_ERROR_OK, metadata_->Initialize());
 
     about_resource_loader_.reset(new AboutResourceLoader(scheduler_.get()));
     loader_controller_.reset(new LoaderController);
     change_list_loader_.reset(
         new ChangeListLoader(logger_.get(),
-                             base::MessageLoopProxy::current().get(),
+                             base::ThreadTaskRunnerHandle::Get().get(),
                              metadata_.get(),
                              scheduler_.get(),
                              about_resource_loader_.get(),
@@ -247,7 +250,7 @@ TEST_F(ChangeListLoaderTest, Load_LocalMetadataAvailable) {
   about_resource_loader_.reset(new AboutResourceLoader(scheduler_.get()));
   change_list_loader_.reset(
       new ChangeListLoader(logger_.get(),
-                           base::MessageLoopProxy::current().get(),
+                           base::ThreadTaskRunnerHandle::Get().get(),
                            metadata_.get(),
                            scheduler_.get(),
                            about_resource_loader_.get(),

chrome/browser/chromeos/drive/change_list_processor_unittest.cc

@@ -5,7 +5,8 @@
 #include "chrome/browser/chromeos/drive/change_list_processor.h"
 
 #include "base/files/scoped_temp_dir.h"
-#include "base/message_loop/message_loop_proxy.h"
+#include "base/single_thread_task_runner.h"
+#include "base/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h"
@@ -102,19 +103,19 @@ class ChangeListProcessorTest : public testing::Test {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
     metadata_storage_.reset(new ResourceMetadataStorage(
-        temp_dir_.path(), base::MessageLoopProxy::current().get()));
+        temp_dir_.path(), base::ThreadTaskRunnerHandle::Get().get()));
     ASSERT_TRUE(metadata_storage_->Initialize());
 
     fake_free_disk_space_getter_.reset(new FakeFreeDiskSpaceGetter);
     cache_.reset(new FileCache(metadata_storage_.get(),
                                temp_dir_.path(),
-                               base::MessageLoopProxy::current().get(),
+                               base::ThreadTaskRunnerHandle::Get().get(),
                                fake_free_disk_space_getter_.get()));
     ASSERT_TRUE(cache_->Initialize());
 
     metadata_.reset(new internal::ResourceMetadata(
         metadata_storage_.get(), cache_.get(),
-        base::MessageLoopProxy::current()));
+        base::ThreadTaskRunnerHandle::Get()));
     ASSERT_EQ(FILE_ERROR_OK, metadata_->Initialize());
   }
 

chrome/browser/chromeos/drive/directory_loader_unittest.cc

@@ -9,6 +9,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/run_loop.h"
+#include "base/single_thread_task_runner.h"
+#include "base/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/drive/change_list_loader.h"
 #include "chrome/browser/chromeos/drive/change_list_loader_observer.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
@@ -75,30 +77,31 @@ class DirectoryLoaderTest : public testing::Test {
     drive_service_.reset(new FakeDriveService);
     ASSERT_TRUE(test_util::SetUpTestEntries(drive_service_.get()));
 
-    scheduler_.reset(new JobScheduler(pref_service_.get(),
-                                      logger_.get(),
-                                      drive_service_.get(),
-                                      base::MessageLoopProxy::current().get()));
+    scheduler_.reset(new JobScheduler(
+        pref_service_.get(),
+        logger_.get(),
+        drive_service_.get(),
+        base::ThreadTaskRunnerHandle::Get().get()));
     metadata_storage_.reset(new ResourceMetadataStorage(
-        temp_dir_.path(), base::MessageLoopProxy::current().get()));
+        temp_dir_.path(), base::ThreadTaskRunnerHandle::Get().get()));
     ASSERT_TRUE(metadata_storage_->Initialize());
 
     cache_.reset(new FileCache(metadata_storage_.get(),
                                temp_dir_.path(),
-                               base::MessageLoopProxy::current().get(),
+                               base::ThreadTaskRunnerHandle::Get().get(),
                                NULL /* free_disk_space_getter */));
     ASSERT_TRUE(cache_->Initialize());
 
     metadata_.reset(new ResourceMetadata(
         metadata_storage_.get(), cache_.get(),
-        base::MessageLoopProxy::current().get()));
+        base::ThreadTaskRunnerHandle::Get().get()));
     ASSERT_EQ(FILE_ERROR_OK, metadata_->Initialize());
 
     about_resource_loader_.reset(new AboutResourceLoader(scheduler_.get()));
     loader_controller_.reset(new LoaderController);
     directory_loader_.reset(
         new DirectoryLoader(logger_.get(),
-                             base::MessageLoopProxy::current().get(),
+                             base::ThreadTaskRunnerHandle::Get().get(),
                              metadata_.get(),
                              scheduler_.get(),
                              about_resource_loader_.get(),

chrome/browser/chromeos/drive/file_cache_unittest.cc

@@ -13,6 +13,8 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/md5.h"
 #include "base/path_service.h"
+#include "base/single_thread_task_runner.h"
+#include "base/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
@@ -45,13 +47,13 @@ class FileCacheTest : public testing::Test {
 
     metadata_storage_.reset(new ResourceMetadataStorage(
         metadata_dir,
-        base::MessageLoopProxy::current().get()));
+        base::ThreadTaskRunnerHandle::Get().get()));
     ASSERT_TRUE(metadata_storage_->Initialize());
 
     cache_.reset(new FileCache(
         metadata_storage_.get(),
         cache_files_dir_,
-        base::MessageLoopProxy::current().get(),
+        base::ThreadTaskRunnerHandle::Get().get(),
         fake_free_disk_space_getter_.get()));
     ASSERT_TRUE(cache_->Initialize());
   }

chrome/browser/chromeos/drive/file_system/truncate_operation.cc

@@ -9,9 +9,9 @@
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
-#include "base/message_loop/message_loop_proxy.h"
 #include "base/sequenced_task_runner.h"
 #include "base/task_runner_util.h"
+#include "base/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
 #include "chrome/browser/chromeos/drive/file_errors.h"
@@ -84,7 +84,7 @@ void TruncateOperation::Truncate(const base::FilePath& file_path,
   DCHECK(!callback.is_null());
 
   if (length < 0) {
-    base::MessageLoopProxy::current()->PostTask(
+    base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(callback, FILE_ERROR_INVALID_OPERATION));
     return;

chrome/browser/chromeos/drive/file_system_unittest.cc

@@ -12,9 +12,10 @@
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/message_loop/message_loop_proxy.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/run_loop.h"
+#include "base/single_thread_task_runner.h"
+#include "base/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/drive/change_list_loader.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h"
@@ -106,10 +107,11 @@ class FileSystemTest : public testing::Test {
 
     fake_free_disk_space_getter_.reset(new FakeFreeDiskSpaceGetter);
 
-    scheduler_.reset(new JobScheduler(pref_service_.get(),
-                                      logger_.get(),
-                                      fake_drive_service_.get(),
-                                      base::MessageLoopProxy::current().get()));
+    scheduler_.reset(new JobScheduler(
+        pref_service_.get(),
+        logger_.get(),
+        fake_drive_service_.get(),
+        base::ThreadTaskRunnerHandle::Get().get()));
 
     mock_directory_observer_.reset(new MockDirectoryChangeObserver);
 
@@ -120,7 +122,7 @@ class FileSystemTest : public testing::Test {
     const base::FilePath metadata_dir = temp_dir_.path().AppendASCII("meta");
     ASSERT_TRUE(base::CreateDirectory(metadata_dir));
     metadata_storage_.reset(new internal::ResourceMetadataStorage(
-        metadata_dir, base::MessageLoopProxy::current().get()));
+        metadata_dir, base::ThreadTaskRunnerHandle::Get().get()));
     ASSERT_TRUE(metadata_storage_->Initialize());
 
     const base::FilePath cache_dir = temp_dir_.path().AppendASCII("files");
@@ -128,13 +130,13 @@ class FileSystemTest : public testing::Test {
     cache_.reset(new internal::FileCache(
         metadata_storage_.get(),
         cache_dir,
-        base::MessageLoopProxy::current().get(),
+        base::ThreadTaskRunnerHandle::Get().get(),
         fake_free_disk_space_getter_.get()));
     ASSERT_TRUE(cache_->Initialize());
 
     resource_metadata_.reset(new internal::ResourceMetadata(
         metadata_storage_.get(), cache_.get(),
-        base::MessageLoopProxy::current()));
+        base::ThreadTaskRunnerHandle::Get()));
     ASSERT_EQ(FILE_ERROR_OK, resource_metadata_->Initialize());
 
     const base::FilePath temp_file_dir = temp_dir_.path().AppendASCII("tmp");
@@ -145,7 +147,7 @@ class FileSystemTest : public testing::Test {
         cache_.get(),
         scheduler_.get(),
         resource_metadata_.get(),
-        base::MessageLoopProxy::current().get(),
+        base::ThreadTaskRunnerHandle::Get().get(),
         temp_file_dir));
     file_system_->AddObserver(mock_directory_observer_.get());
 
@@ -224,19 +226,19 @@ class FileSystemTest : public testing::Test {
     scoped_ptr<internal::ResourceMetadataStorage,
                test_util::DestroyHelperForTests> metadata_storage(
         new internal::ResourceMetadataStorage(
-            metadata_dir, base::MessageLoopProxy::current().get()));
+            metadata_dir, base::ThreadTaskRunnerHandle::Get().get()));
 
     const base::FilePath cache_dir = temp_dir_.path().AppendASCII("files");
     scoped_ptr<internal::FileCache, test_util::DestroyHelperForTests> cache(
         new internal::FileCache(metadata_storage.get(),
                                 cache_dir,
-                                base::MessageLoopProxy::current().get(),
+                                base::ThreadTaskRunnerHandle::Get().get(),
                                 fake_free_disk_space_getter_.get()));
 
     scoped_ptr<internal::ResourceMetadata, test_util::DestroyHelperForTests>
         resource_metadata(new internal::ResourceMetadata(
             metadata_storage_.get(), cache.get(),
-            base::MessageLoopProxy::current()));
+            base::ThreadTaskRunnerHandle::Get()));
 
     ASSERT_EQ(FILE_ERROR_OK, resource_metadata->Initialize());
 

chrome/browser/chromeos/drive/file_system_util.cc

@@ -16,11 +16,11 @@
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/message_loop/message_loop_proxy.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
+#include "base/thread_task_runner_handle.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
@@ -298,7 +298,7 @@ void EnsureDirectoryExists(Profile* profile,
         true /* is_recursive */,
         callback);
   } else {
-    base::MessageLoopProxy::current()->PostTask(
+    base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(callback, FILE_ERROR_OK));
   }
 }

chrome/browser/chromeos/drive/file_system_util_unittest.cc

@@ -9,7 +9,9 @@
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
@@ -131,8 +133,8 @@ TEST_F(FileSystemUtilTest, ExtractDrivePathFromFileSystemUrl) {
       storage::ExternalMountPoints::CreateRefCounted();
   scoped_refptr<storage::FileSystemContext> context(
       new storage::FileSystemContext(
-          base::MessageLoopProxy::current().get(),
-          base::MessageLoopProxy::current().get(),
+          base::ThreadTaskRunnerHandle::Get().get(),
+          base::ThreadTaskRunnerHandle::Get().get(),
           mount_points.get(),
           NULL,  // special_storage_policy
           NULL,  // quota_manager_proxy,

chrome/browser/chromeos/drive/fileapi/async_file_util.cc

@@ -7,6 +7,8 @@
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
+#include "base/single_thread_task_runner.h"
+#include "base/thread_task_runner_handle.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
@@ -58,7 +60,7 @@ void PostFileSystemCallback(
                  on_error_callback.is_null() ?
                  base::Closure() :
                  base::Bind(&google_apis::RunTaskWithTaskRunner,
-                            base::MessageLoopProxy::current(),
+                            base::ThreadTaskRunnerHandle::Get(),
                             on_error_callback)));
 }
 

chrome/browser/chromeos/drive/fileapi/fileapi_worker.cc

@@ -7,6 +7,7 @@
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/task_runner_util.h"
+#include "base/thread_task_runner_handle.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/file_errors.h"
@@ -340,7 +341,7 @@ void OpenFile(const base::FilePath& file_path,
                      base::File::FLAG_WRITE |
                      base::File::FLAG_WRITE_ATTRIBUTES |
                      base::File::FLAG_APPEND)) {
-    base::MessageLoopProxy::current()->PostTask(
+    base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(callback,
                    Passed(base::File(base::File::FILE_ERROR_FAILED)),

chrome/browser/chromeos/drive/job_scheduler.cc

@@ -7,12 +7,12 @@
 #include <algorithm>
 
 #include "base/files/file_util.h"
-#include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
+#include "base/thread_task_runner_handle.h"
 #include "chrome/browser/drive/event_logger.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
@@ -791,7 +791,7 @@ void JobScheduler::DoJobLoop(QueueType queue_type) {
   // Wait when throttled.
   const base::Time now = base::Time::Now();
   if (now < wait_until_) {
-    base::MessageLoopProxy::current()->PostDelayedTask(
+    base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&JobScheduler::DoJobLoop,
                    weak_ptr_factory_.GetWeakPtr(),
@@ -921,7 +921,8 @@ bool JobScheduler::OnJobDone(JobID job_id,
 
   // Post a task to continue the job loop.  This allows us to finish handling
   // the current job before starting the next one.
-  base::MessageLoopProxy::current()->PostTask(FROM_HERE,
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
+      FROM_HERE,
       base::Bind(&JobScheduler::DoJobLoop,
                  weak_ptr_factory_.GetWeakPtr(),
                  queue_type));
@@ -1152,8 +1153,8 @@ void JobScheduler::AbortNotRunningJob(JobEntry* job,
   queue_[GetJobQueueType(job->job_info.job_type)]->Remove(job->job_info.job_id);
   NotifyJobDone(job->job_info, error);
   job_map_.Remove(job->job_info.job_id);
-  base::MessageLoopProxy::current()->PostTask(FROM_HERE,
-                                              base::Bind(callback, error));
+  base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
+                                                base::Bind(callback, error));
 }
 
 void JobScheduler::NotifyJobAdded(const JobInfo& job_info) {

chrome/browser/chromeos/drive/job_scheduler_unittest.cc

@@ -11,8 +11,10 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/run_loop.h"
+#include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
+#include "base/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/drive/test_util.h"
 #include "chrome/browser/drive/event_logger.h"
 #include "chrome/browser/drive/fake_drive_service.h"
@@ -142,10 +144,11 @@ class JobSchedulerTest : public testing::Test {
     test_util::SetUpTestEntries(fake_drive_service_.get());
     fake_drive_service_->LoadAppListForDriveApi("drive/applist.json");
 
-    scheduler_.reset(new JobScheduler(pref_service_.get(),
-                                      logger_.get(),
-                                      fake_drive_service_.get(),
-                                      base::MessageLoopProxy::current().get()));
+    scheduler_.reset(new JobScheduler(
+        pref_service_.get(),
+        logger_.get(),
+        fake_drive_service_.get(),
+        base::ThreadTaskRunnerHandle::Get().get()));
     scheduler_->SetDisableThrottling(true);
   }
 

chrome/browser/chromeos/drive/remove_stale_cache_files_unittest.cc

@@ -8,6 +8,8 @@
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/single_thread_task_runner.h"
+#include "base/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
@@ -29,16 +31,16 @@ class RemoveStaleCacheFilesTest : public testing::Test {
     fake_free_disk_space_getter_.reset(new FakeFreeDiskSpaceGetter);
 
     metadata_storage_.reset(new ResourceMetadataStorage(
-        temp_dir_.path(), base::MessageLoopProxy::current().get()));
+        temp_dir_.path(), base::ThreadTaskRunnerHandle::Get().get()));
 
     cache_.reset(new FileCache(metadata_storage_.get(),
                                temp_dir_.path(),
-                               base::MessageLoopProxy::current().get(),
+                               base::ThreadTaskRunnerHandle::Get().get(),
                                fake_free_disk_space_getter_.get()));
 
     resource_metadata_.reset(new ResourceMetadata(
         metadata_storage_.get(), cache_.get(),
-        base::MessageLoopProxy::current()));
+        base::ThreadTaskRunnerHandle::Get()));
 
     ASSERT_TRUE(metadata_storage_->Initialize());
     ASSERT_TRUE(cache_->Initialize());

chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc

@@ -8,7 +8,9 @@
 
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/single_thread_task_runner.h"
 #include "base/strings/string_split.h"
+#include "base/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/test_util.h"
 #include "content/public/test/test_browser_thread_bundle.h"
@@ -25,7 +27,7 @@ class ResourceMetadataStorageTest : public testing::Test {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
     storage_.reset(new ResourceMetadataStorage(
-        temp_dir_.path(), base::MessageLoopProxy::current().get()));
+        temp_dir_.path(), base::ThreadTaskRunnerHandle::Get().get()));
     ASSERT_TRUE(storage_->Initialize());
   }
 
@@ -264,7 +266,7 @@ TEST_F(ResourceMetadataStorageTest, OpenExistingDB) {
 
   // Close DB and reopen.
   storage_.reset(new ResourceMetadataStorage(
-      temp_dir_.path(), base::MessageLoopProxy::current().get()));
+      temp_dir_.path(), base::ThreadTaskRunnerHandle::Get().get()));
   ASSERT_TRUE(storage_->Initialize());
 
   // Can read data.
@@ -310,7 +312,7 @@ TEST_F(ResourceMetadataStorageTest, IncompatibleDB_M29) {
   storage_.reset();
   EXPECT_TRUE(ResourceMetadataStorage::UpgradeOldDB(temp_dir_.path()));
   storage_.reset(new ResourceMetadataStorage(
-      temp_dir_.path(), base::MessageLoopProxy::current().get()));
+      temp_dir_.path(), base::ThreadTaskRunnerHandle::Get().get()));
   ASSERT_TRUE(storage_->Initialize());
 
   // Resource-ID-to-local-ID mapping is added.
@@ -362,7 +364,7 @@ TEST_F(ResourceMetadataStorageTest, IncompatibleDB_M32) {
   storage_.reset();
   EXPECT_TRUE(ResourceMetadataStorage::UpgradeOldDB(temp_dir_.path()));
   storage_.reset(new ResourceMetadataStorage(
-      temp_dir_.path(), base::MessageLoopProxy::current().get()));
+      temp_dir_.path(), base::ThreadTaskRunnerHandle::Get().get()));
   ASSERT_TRUE(storage_->Initialize());
 
   // Data is erased, except cache and id mapping entries.
@@ -423,7 +425,7 @@ TEST_F(ResourceMetadataStorageTest, IncompatibleDB_M33) {
   storage_.reset();
   EXPECT_TRUE(ResourceMetadataStorage::UpgradeOldDB(temp_dir_.path()));
   storage_.reset(new ResourceMetadataStorage(
-      temp_dir_.path(), base::MessageLoopProxy::current().get()));
+      temp_dir_.path(), base::ThreadTaskRunnerHandle::Get().get()));
   ASSERT_TRUE(storage_->Initialize());
 
   // No data is lost.
@@ -461,7 +463,7 @@ TEST_F(ResourceMetadataStorageTest, IncompatibleDB_Unknown) {
   storage_.reset();
   EXPECT_FALSE(ResourceMetadataStorage::UpgradeOldDB(temp_dir_.path()));
   storage_.reset(new ResourceMetadataStorage(
-      temp_dir_.path(), base::MessageLoopProxy::current().get()));
+      temp_dir_.path(), base::ThreadTaskRunnerHandle::Get().get()));
   ASSERT_TRUE(storage_->Initialize());
 
   // Data is erased because of the incompatible version.
@@ -494,7 +496,7 @@ TEST_F(ResourceMetadataStorageTest, DeleteUnusedIDEntries) {
   storage_.reset();
   EXPECT_TRUE(ResourceMetadataStorage::UpgradeOldDB(temp_dir_.path()));
   storage_.reset(new ResourceMetadataStorage(
-      temp_dir_.path(), base::MessageLoopProxy::current().get()));
+      temp_dir_.path(), base::ThreadTaskRunnerHandle::Get().get()));
   ASSERT_TRUE(storage_->Initialize());
 
   // Only the unused entry is deleted.
@@ -511,7 +513,7 @@ TEST_F(ResourceMetadataStorageTest, WrongPath) {
   ASSERT_TRUE(base::CreateTemporaryFileInDir(temp_dir_.path(), &path));
 
   storage_.reset(new ResourceMetadataStorage(
-      path, base::MessageLoopProxy::current().get()));
+      path, base::ThreadTaskRunnerHandle::Get().get()));
   // Cannot initialize DB beacause the path does not point a directory.
   ASSERT_FALSE(storage_->Initialize());
 }
@@ -540,7 +542,7 @@ TEST_F(ResourceMetadataStorageTest, RecoverCacheEntriesFromTrashedResourceMap) {
 
   // Reopen. This should result in trashing the DB.
   storage_.reset(new ResourceMetadataStorage(
-      temp_dir_.path(), base::MessageLoopProxy::current().get()));
+      temp_dir_.path(), base::ThreadTaskRunnerHandle::Get().get()));
   ASSERT_TRUE(storage_->Initialize());
 
   // Recover cache entries from the trashed DB.

chrome/browser/chromeos/drive/resource_metadata_unittest.cc

@@ -9,7 +9,9 @@
 #include <vector>
 
 #include "base/files/scoped_temp_dir.h"
+#include "base/single_thread_task_runner.h"
 #include "base/strings/stringprintf.h"
+#include "base/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
@@ -138,19 +140,19 @@ class ResourceMetadataTest : public testing::Test {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
     metadata_storage_.reset(new ResourceMetadataStorage(
-        temp_dir_.path(), base::MessageLoopProxy::current().get()));
+        temp_dir_.path(), base::ThreadTaskRunnerHandle::Get().get()));
     ASSERT_TRUE(metadata_storage_->Initialize());
 
     fake_free_disk_space_getter_.reset(new FakeFreeDiskSpaceGetter);
     cache_.reset(new FileCache(metadata_storage_.get(),
                                temp_dir_.path(),
-                               base::MessageLoopProxy::current().get(),
+                               base::ThreadTaskRunnerHandle::Get().get(),
                                fake_free_disk_space_getter_.get()));
     ASSERT_TRUE(cache_->Initialize());
 
     resource_metadata_.reset(new ResourceMetadata(
         metadata_storage_.get(), cache_.get(),
-        base::MessageLoopProxy::current()));
+        base::ThreadTaskRunnerHandle::Get()));
 
     ASSERT_EQ(FILE_ERROR_OK, resource_metadata_->Initialize());
 

chrome/browser/chromeos/drive/search_metadata_unittest.cc

@@ -7,9 +7,10 @@
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/i18n/string_search.h"
-#include "base/message_loop/message_loop_proxy.h"
 #include "base/run_loop.h"
+#include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
@@ -45,19 +46,19 @@ class SearchMetadataTest : public testing::Test {
     fake_free_disk_space_getter_.reset(new FakeFreeDiskSpaceGetter);
 
     metadata_storage_.reset(new ResourceMetadataStorage(
-        temp_dir_.path(), base::MessageLoopProxy::current().get()));
+        temp_dir_.path(), base::ThreadTaskRunnerHandle::Get().get()));
     ASSERT_TRUE(metadata_storage_->Initialize());
 
     cache_.reset(new FileCache(metadata_storage_.get(),
                                temp_dir_.path(),
-                               base::MessageLoopProxy::current().get(),
+                               base::ThreadTaskRunnerHandle::Get().get(),
                                fake_free_disk_space_getter_.get()));
     ASSERT_TRUE(cache_->Initialize());
 
     resource_metadata_.reset(
         new ResourceMetadata(metadata_storage_.get(),
                              cache_.get(),
-                             base::MessageLoopProxy::current()));
+                             base::ThreadTaskRunnerHandle::Get().get()));
     ASSERT_EQ(FILE_ERROR_OK, resource_metadata_->Initialize());
 
     AddEntriesToMetadata();
@@ -163,7 +164,7 @@ TEST_F(SearchMetadataTest, SearchMetadata_ZeroMatches) {
   scoped_ptr<MetadataSearchResultVector> result;
 
   SearchMetadata(
-      base::MessageLoopProxy::current(), resource_metadata_.get(),
+      base::ThreadTaskRunnerHandle::Get(), resource_metadata_.get(),
       "NonExistent", base::Bind(&MatchesType, SEARCH_METADATA_ALL),
       kDefaultAtMostNumMatches,
       google_apis::test_util::CreateCopyResultCallback(&error, &result));
@@ -178,7 +179,7 @@ TEST_F(SearchMetadataTest, SearchMetadata_RegularFile) {
   scoped_ptr<MetadataSearchResultVector> result;
 
   SearchMetadata(
-      base::MessageLoopProxy::current(), resource_metadata_.get(),
+      base::ThreadTaskRunnerHandle::Get(), resource_metadata_.get(),
       "SubDirectory File 1.txt", base::Bind(&MatchesType, SEARCH_METADATA_ALL),
       kDefaultAtMostNumMatches,
       google_apis::test_util::CreateCopyResultCallback(&error, &result));
@@ -198,7 +199,7 @@ TEST_F(SearchMetadataTest, SearchMetadata_CaseInsensitiveSearch) {
 
   // The query is all in lower case.
   SearchMetadata(
-      base::MessageLoopProxy::current(), resource_metadata_.get(),
+      base::ThreadTaskRunnerHandle::Get(), resource_metadata_.get(),
       "subdirectory file 1.txt", base::Bind(&MatchesType, SEARCH_METADATA_ALL),
       kDefaultAtMostNumMatches,
       google_apis::test_util::CreateCopyResultCallback(&error, &result));
@@ -215,7 +216,7 @@ TEST_F(SearchMetadataTest, SearchMetadata_RegularFiles) {
   scoped_ptr<MetadataSearchResultVector> result;
 
   SearchMetadata(
-      base::MessageLoopProxy::current(), resource_metadata_.get(), "SubDir",
+      base::ThreadTaskRunnerHandle::Get(), resource_metadata_.get(), "SubDir",
       base::Bind(&MatchesType, SEARCH_METADATA_ALL), kDefaultAtMostNumMatches,
       google_apis::test_util::CreateCopyResultCallback(&error, &result));
   base::RunLoop().RunUntilIdle();
@@ -238,7 +239,7 @@ TEST_F(SearchMetadataTest, SearchMetadata_AtMostOneFile) {
   // There are two files matching "SubDir" but only one file should be
   // returned.
   SearchMetadata(
-      base::MessageLoopProxy::current(), resource_metadata_.get(), "SubDir",
+      base::ThreadTaskRunnerHandle::Get(), resource_metadata_.get(), "SubDir",
       base::Bind(&MatchesType, SEARCH_METADATA_ALL),
       1,  // at_most_num_matches
       google_apis::test_util::CreateCopyResultCallback(&error, &result));
@@ -255,7 +256,7 @@ TEST_F(SearchMetadataTest, SearchMetadata_Directory) {
   scoped_ptr<MetadataSearchResultVector> result;
 
   SearchMetadata(
-      base::MessageLoopProxy::current(), resource_metadata_.get(),
+      base::ThreadTaskRunnerHandle::Get(), resource_metadata_.get(),
       "Directory 1", base::Bind(&MatchesType, SEARCH_METADATA_ALL),
       kDefaultAtMostNumMatches,
       google_apis::test_util::CreateCopyResultCallback(&error, &result));
@@ -271,7 +272,7 @@ TEST_F(SearchMetadataTest, SearchMetadata_HostedDocument) {
   scoped_ptr<MetadataSearchResultVector> result;
 
   SearchMetadata(
-      base::MessageLoopProxy::current(), resource_metadata_.get(), "Document",
+      base::ThreadTaskRunnerHandle::Get(), resource_metadata_.get(), "Document",
       base::Bind(&MatchesType, SEARCH_METADATA_ALL), kDefaultAtMostNumMatches,
       google_apis::test_util::CreateCopyResultCallback(&error, &result));
   base::RunLoop().RunUntilIdle();
@@ -288,7 +289,7 @@ TEST_F(SearchMetadataTest, SearchMetadata_ExcludeHostedDocument) {
   scoped_ptr<MetadataSearchResultVector> result;
 
   SearchMetadata(
-      base::MessageLoopProxy::current(), resource_metadata_.get(), "Document",
+      base::ThreadTaskRunnerHandle::Get(), resource_metadata_.get(), "Document",
       base::Bind(&MatchesType, SEARCH_METADATA_EXCLUDE_HOSTED_DOCUMENTS),
       kDefaultAtMostNumMatches,
       google_apis::test_util::CreateCopyResultCallback(&error, &result));
@@ -303,7 +304,7 @@ TEST_F(SearchMetadataTest, SearchMetadata_SharedWithMe) {
   scoped_ptr<MetadataSearchResultVector> result;
 
   SearchMetadata(
-      base::MessageLoopProxy::current(), resource_metadata_.get(), "",
+      base::ThreadTaskRunnerHandle::Get(), resource_metadata_.get(), "",
       base::Bind(&MatchesType, SEARCH_METADATA_SHARED_WITH_ME),
       kDefaultAtMostNumMatches,
       google_apis::test_util::CreateCopyResultCallback(&error, &result));
@@ -320,7 +321,7 @@ TEST_F(SearchMetadataTest, SearchMetadata_FileAndDirectory) {
   scoped_ptr<MetadataSearchResultVector> result;
 
   SearchMetadata(
-      base::MessageLoopProxy::current(), resource_metadata_.get(),
+      base::ThreadTaskRunnerHandle::Get(), resource_metadata_.get(),
       "excludeDir-test", base::Bind(&MatchesType, SEARCH_METADATA_ALL),
       kDefaultAtMostNumMatches,
       google_apis::test_util::CreateCopyResultCallback(&error, &result));
@@ -341,7 +342,7 @@ TEST_F(SearchMetadataTest, SearchMetadata_ExcludeDirectory) {
   scoped_ptr<MetadataSearchResultVector> result;
 
   SearchMetadata(
-      base::MessageLoopProxy::current(), resource_metadata_.get(),
+      base::ThreadTaskRunnerHandle::Get(), resource_metadata_.get(),
       "excludeDir-test",
       base::Bind(&MatchesType, SEARCH_METADATA_EXCLUDE_DIRECTORIES),
       kDefaultAtMostNumMatches,
@@ -365,7 +366,7 @@ TEST_F(SearchMetadataTest, SearchMetadata_ExcludeSpecialDirectories) {
 
     const std::string query = kQueries[i];
     SearchMetadata(
-        base::MessageLoopProxy::current(), resource_metadata_.get(), query,
+        base::ThreadTaskRunnerHandle::Get(), resource_metadata_.get(), query,
         base::Bind(&MatchesType, SEARCH_METADATA_ALL), kDefaultAtMostNumMatches,
         google_apis::test_util::CreateCopyResultCallback(&error, &result));
 
@@ -381,7 +382,7 @@ TEST_F(SearchMetadataTest, SearchMetadata_Offline) {
   scoped_ptr<MetadataSearchResultVector> result;
 
   SearchMetadata(
-      base::MessageLoopProxy::current(), resource_metadata_.get(), "",
+      base::ThreadTaskRunnerHandle::Get(), resource_metadata_.get(), "",
       base::Bind(&MatchesType, SEARCH_METADATA_OFFLINE),
       kDefaultAtMostNumMatches,
       google_apis::test_util::CreateCopyResultCallback(&error, &result));

chrome/browser/chromeos/drive/sync_client.cc

@@ -7,7 +7,7 @@
 #include <vector>
 
 #include "base/bind.h"
-#include "base/message_loop/message_loop_proxy.h"
+#include "base/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
 #include "chrome/browser/chromeos/drive/file_system/download_operation.h"
@@ -323,7 +323,7 @@ void SyncClient::AddTask(const SyncTasks::key_type& key,
     tasks_[key] = task;
   }
   DCHECK_EQ(PENDING, task.state);
-  base::MessageLoopProxy::current()->PostDelayedTask(
+  base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&SyncClient::StartTask, weak_ptr_factory_.GetWeakPtr(), key),
       delay);
@@ -454,7 +454,7 @@ void SyncClient::OnTaskComplete(SyncType type,
   }
 
   for (size_t i = 0; i < it->second.waiting_callbacks.size(); ++i) {
-    base::MessageLoopProxy::current()->PostTask(
+    base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(it->second.waiting_callbacks[i], error));
   }
   it->second.waiting_callbacks.clear();
@@ -463,7 +463,7 @@ void SyncClient::OnTaskComplete(SyncType type,
     DVLOG(1) << "Running again: type = " << type << ", id = " << local_id;
     it->second.state = PENDING;
     it->second.should_run_again = false;
-    base::MessageLoopProxy::current()->PostDelayedTask(
+    base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&SyncClient::StartTask, weak_ptr_factory_.GetWeakPtr(), key),
         retry_delay);

chrome/browser/chromeos/drive/sync_client_unittest.cc

@@ -10,7 +10,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/run_loop.h"
+#include "base/single_thread_task_runner.h"
 #include "base/test/test_timeouts.h"
+#include "base/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/drive/change_list_loader.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h"
@@ -57,7 +59,7 @@ class SyncClientTestDriveService : public ::drive::FakeDriveService {
       const google_apis::ProgressCallback& progress_callback) override {
     ++download_file_count_;
     if (resource_id == resource_id_to_be_cancelled_) {
-      base::MessageLoopProxy::current()->PostTask(
+      base::ThreadTaskRunnerHandle::Get()->PostTask(
           FROM_HERE,
           base::Bind(download_action_callback,
                      google_apis::DRIVE_CANCELLED,
@@ -113,38 +115,39 @@ class SyncClientTest : public testing::Test {
 
     drive_service_.reset(new SyncClientTestDriveService);
 
-    scheduler_.reset(new JobScheduler(pref_service_.get(),
-                                      logger_.get(),
-                                      drive_service_.get(),
-                                      base::MessageLoopProxy::current().get()));
+    scheduler_.reset(new JobScheduler(
+        pref_service_.get(),
+        logger_.get(),
+        drive_service_.get(),
+        base::ThreadTaskRunnerHandle::Get().get()));
 
     metadata_storage_.reset(new ResourceMetadataStorage(
-        temp_dir_.path(), base::MessageLoopProxy::current().get()));
+        temp_dir_.path(), base::ThreadTaskRunnerHandle::Get().get()));
     ASSERT_TRUE(metadata_storage_->Initialize());
 
     cache_.reset(new FileCache(metadata_storage_.get(),
                                temp_dir_.path(),
-                               base::MessageLoopProxy::current().get(),
+                               base::ThreadTaskRunnerHandle::Get().get(),
                                NULL /* free_disk_space_getter */));
     ASSERT_TRUE(cache_->Initialize());
 
     metadata_.reset(new internal::ResourceMetadata(
         metadata_storage_.get(), cache_.get(),
-        base::MessageLoopProxy::current()));
+        base::ThreadTaskRunnerHandle::Get()));
     ASSERT_EQ(FILE_ERROR_OK, metadata_->Initialize());
 
     about_resource_loader_.reset(new AboutResourceLoader(scheduler_.get()));
     loader_controller_.reset(new LoaderController);
     change_list_loader_.reset(new ChangeListLoader(
         logger_.get(),
-        base::MessageLoopProxy::current().get(),
+        base::ThreadTaskRunnerHandle::Get().get(),
         metadata_.get(),
         scheduler_.get(),
         about_resource_loader_.get(),
         loader_controller_.get()));
     ASSERT_NO_FATAL_FAILURE(SetUpTestData());
 
-    sync_client_.reset(new SyncClient(base::MessageLoopProxy::current().get(),
+    sync_client_.reset(new SyncClient(base::ThreadTaskRunnerHandle::Get().get(),
                                       &delegate_,
                                       scheduler_.get(),
                                       metadata_.get(),
@@ -217,7 +220,7 @@ class SyncClientTest : public testing::Test {
 
     // Prepare a removed file.
     file_system::RemoveOperation remove_operation(
-        base::MessageLoopProxy::current().get(), &delegate_, metadata_.get(),
+        base::ThreadTaskRunnerHandle::Get().get(), &delegate_, metadata_.get(),
         cache_.get());
     remove_operation.Remove(
         util::GetDriveMyDriveRootPath().AppendASCII("removed"),
@@ -228,7 +231,7 @@ class SyncClientTest : public testing::Test {
 
     // Prepare a moved file.
     file_system::MoveOperation move_operation(
-        base::MessageLoopProxy::current().get(), &delegate_, metadata_.get());
+        base::ThreadTaskRunnerHandle::Get().get(), &delegate_, metadata_.get());
     move_operation.Move(
         util::GetDriveMyDriveRootPath().AppendASCII("moved"),
         util::GetDriveMyDriveRootPath().AppendASCII("moved_new_title"),
@@ -387,7 +390,7 @@ TEST_F(SyncClientTest, RetryOnDisconnection) {
   // FILE_ERROR_NO_CONNECTION is handled by SyncClient correctly.
   // Without this delay, JobScheduler will keep the jobs unrun and SyncClient
   // will receive no error.
-  base::MessageLoopProxy::current()->PostDelayedTask(
+  base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&test_util::FakeNetworkChangeNotifier::SetConnectionType,
                  base::Unretained(fake_network_change_notifier_.get()),