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

chrome/browser/chromeos/drive/sync_client_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/sync_client.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/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"
 #include "chrome/browser/chromeos/drive/file_cache.h"
 #include "chrome/browser/chromeos/drive/file_change.h"
 #include "chrome/browser/chromeos/drive/file_system/move_operation.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "chrome/browser/chromeos/drive/file_system/remove_operation.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
@@ skipping 26 matching lines @@
 
   // FakeDriveService override:
   google_apis::CancelCallback DownloadFile(
       const base::FilePath& local_cache_path,
       const std::string& resource_id,
       const google_apis::DownloadActionCallback& download_action_callback,
       const google_apis::GetContentCallback& get_content_callback,
       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,
                      base::FilePath()));
       return google_apis::CancelCallback();
     }
     if (resource_id == resource_id_to_be_paused_) {
       paused_action_ = base::Bind(download_action_callback,
                                   google_apis::DRIVE_OTHER_ERROR,
                                   base::FilePath());
@@ skipping 35 matching lines @@
     pref_service_.reset(new TestingPrefServiceSimple);
     test_util::RegisterDrivePrefs(pref_service_->registry());
 
     fake_network_change_notifier_.reset(
         new test_util::FakeNetworkChangeNotifier);
 
     logger_.reset(new EventLogger);
 
     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(),
                                       cache_.get(),
                                       loader_controller_.get(),
                                       temp_dir_.path()));
 
     // Disable delaying so that DoSyncLoop() starts immediately.
     sync_client_->set_delay_for_testing(base::TimeDelta::FromSeconds(0));
   }
@@ skipping 52 matching lines @@
     EXPECT_EQ(FILE_ERROR_OK, cache_->Pin(GetLocalId("fetched")));
 
     // Prepare a pinned-and-fetched-and-dirty file.
     EXPECT_EQ(FILE_ERROR_OK,
               cache_->Store(GetLocalId("dirty"), std::string(),
                             temp_file, FileCache::FILE_OPERATION_COPY));
     EXPECT_EQ(FILE_ERROR_OK, cache_->Pin(GetLocalId("dirty")));
 
     // 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"),
         false,  // is_recursive
         google_apis::test_util::CreateCopyResultCallback(&error));
     base::RunLoop().RunUntilIdle();
     EXPECT_EQ(FILE_ERROR_OK, error);
 
     // 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"),
         google_apis::test_util::CreateCopyResultCallback(&error));
     base::RunLoop().RunUntilIdle();
     EXPECT_EQ(FILE_ERROR_OK, error);
   }
 
  protected:
   std::string GetLocalId(const std::string& title) {
@@ skipping 138 matching lines @@
   EXPECT_EQ(kLocalContent, content);
 }
 
 TEST_F(SyncClientTest, RetryOnDisconnection) {
   // Let the service go down.
   drive_service_->set_offline(true);
   // Change the network connection state after some delay, to test that
   // 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()),
                  net::NetworkChangeNotifier::CONNECTION_NONE),
       TestTimeouts::tiny_timeout());
 
   // Try fetch and upload.
   sync_client_->AddFetchTask(GetLocalId("foo"));
   sync_client_->AddUpdateTask(ClientContext(USER_INITIATED),
                               GetLocalId("dirty"));
@@ skipping 110 matching lines @@
       local_id, google_apis::test_util::CreateCopyResultCallback(&error)));
 
   base::RunLoop().RunUntilIdle();
 
   // The callback is called.
   EXPECT_EQ(FILE_ERROR_OK, error);
 }
 
 }  // namespace internal
 }  // namespace drive