[chrome/browser/chromeos/drive] Avoid use of MessageLoopProxy by use of TTRH

chrome/browser/chromeos/drive/file_system_unittest.cc

 // 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.
 
 #include "chrome/browser/chromeos/drive/file_system.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #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"
 #include "chrome/browser/chromeos/drive/file_change.h"
 #include "chrome/browser/chromeos/drive/file_system_observer.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 #include "chrome/browser/chromeos/drive/sync_client.h"
 #include "chrome/browser/chromeos/drive/test_util.h"
 #include "chrome/browser/drive/drive_api_util.h"
@@ skipping 71 matching lines @@
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     pref_service_.reset(new TestingPrefServiceSimple);
     test_util::RegisterDrivePrefs(pref_service_->registry());
 
     logger_.reset(new EventLogger);
     fake_drive_service_.reset(new FakeDriveService);
     test_util::SetUpTestEntries(fake_drive_service_.get());
 
     fake_free_disk_space_getter_.reset(new FakeFreeDiskSpaceGetter);
 
-    scheduler_.reset(new JobScheduler(pref_service_.get(),
-                                      logger_.get(),
+    scheduler_.reset(new JobScheduler(pref_service_.get(), logger_.get(),
                                       fake_drive_service_.get(),
-                                      base::MessageLoopProxy::current().get()));
+                                      base::ThreadTaskRunnerHandle::Get()));
 
     mock_directory_observer_.reset(new MockDirectoryChangeObserver);
 
     SetUpResourceMetadataAndFileSystem();
   }
 
   void SetUpResourceMetadataAndFileSystem() {
     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()));
     ASSERT_TRUE(metadata_storage_->Initialize());
 
     const base::FilePath cache_dir = temp_dir_.path().AppendASCII("files");
     ASSERT_TRUE(base::CreateDirectory(cache_dir));
-    cache_.reset(new internal::FileCache(
-        metadata_storage_.get(),
-        cache_dir,
-        base::MessageLoopProxy::current().get(),
-        fake_free_disk_space_getter_.get()));
+    cache_.reset(new internal::FileCache(metadata_storage_.get(), cache_dir,
+                                         base::ThreadTaskRunnerHandle::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()));
+    resource_metadata_.reset(
+        new internal::ResourceMetadata(metadata_storage_.get(), cache_.get(),
+                                       base::ThreadTaskRunnerHandle::Get()));
     ASSERT_EQ(FILE_ERROR_OK, resource_metadata_->Initialize());
 
     const base::FilePath temp_file_dir = temp_dir_.path().AppendASCII("tmp");
     ASSERT_TRUE(base::CreateDirectory(temp_file_dir));
-    file_system_.reset(new FileSystem(
-        pref_service_.get(),
-        logger_.get(),
-        cache_.get(),
-        scheduler_.get(),
-        resource_metadata_.get(),
-        base::MessageLoopProxy::current().get(),
-        temp_file_dir));
+    file_system_.reset(
+        new FileSystem(pref_service_.get(), logger_.get(), cache_.get(),
+                       scheduler_.get(), resource_metadata_.get(),
+                       base::ThreadTaskRunnerHandle::Get(), temp_file_dir));
     file_system_->AddObserver(mock_directory_observer_.get());
 
     // Disable delaying so that the sync starts immediately.
     file_system_->sync_client_for_testing()->set_delay_for_testing(
         base::TimeDelta::FromSeconds(0));
   }
 
   // Loads the full resource list via FakeDriveService.
   bool LoadFullResourceList() {
     FileError error = FILE_ERROR_FAILED;
@@ skipping 55 matching lines @@
   // drive/root/Dir1/SubDir2/File3. If |use_up_to_date_timestamp| is true, sets
   // the changestamp to that of FakeDriveService, indicating the cache is
   // holding the latest file system info.
   void SetUpTestFileSystem(SetUpTestFileSystemParam param) {
     // Destroy the existing resource metadata to close DB.
     resource_metadata_.reset();
 
     const base::FilePath metadata_dir = temp_dir_.path().AppendASCII("meta");
     ASSERT_TRUE(base::CreateDirectory(metadata_dir));
     scoped_ptr<internal::ResourceMetadataStorage,
-               test_util::DestroyHelperForTests> metadata_storage(
-        new internal::ResourceMetadataStorage(
-            metadata_dir, base::MessageLoopProxy::current().get()));
+               test_util::DestroyHelperForTests>
+        metadata_storage(new internal::ResourceMetadataStorage(
+            metadata_dir, base::ThreadTaskRunnerHandle::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(),
+        new internal::FileCache(metadata_storage.get(), cache_dir,
+                                base::ThreadTaskRunnerHandle::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());
 
     const int64 changestamp = param == USE_SERVER_TIMESTAMP ?
         fake_drive_service_->about_resource().largest_change_id() : 1;
     ASSERT_EQ(FILE_ERROR_OK,
               resource_metadata->SetLargestChangestamp(changestamp));
 
     // drive/root
     ResourceEntry root;
@@ skipping 800 matching lines @@
       google_apis::test_util::CreateCopyResultCallback(&available));
   content::RunAllBlockingPoolTasksUntilIdle();
   ASSERT_FALSE(available);
 
   entry = GetResourceEntrySync(file_in_root);
   ASSERT_TRUE(entry);
   EXPECT_FALSE(entry->file_specific_info().cache_state().is_present());
 }
 
 }   // namespace drive