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

chrome/browser/chromeos/drive/change_list_loader_unittest.cc

 // Copyright 2013 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/change_list_loader.h"
 
 #include "base/callback_helpers.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/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"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
 #include "chrome/browser/chromeos/drive/test_util.h"
 #include "chrome/browser/drive/event_logger.h"
 #include "chrome/browser/drive/fake_drive_service.h"
 #include "chrome/browser/drive/test_util.h"
@@ skipping 49 matching lines @@
   void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     pref_service_.reset(new TestingPrefServiceSimple);
     test_util::RegisterDrivePrefs(pref_service_->registry());
 
     logger_.reset(new EventLogger);
 
     drive_service_.reset(new FakeDriveService);
     ASSERT_TRUE(test_util::SetUpTestEntries(drive_service_.get()));
 
-    scheduler_.reset(new JobScheduler(pref_service_.get(),
-                                      logger_.get(),
+    scheduler_.reset(new JobScheduler(pref_service_.get(), logger_.get(),
                                       drive_service_.get(),
-                                      base::MessageLoopProxy::current().get()));
+                                      base::ThreadTaskRunnerHandle::Get()));
     metadata_storage_.reset(new ResourceMetadataStorage(
-        temp_dir_.path(), base::MessageLoopProxy::current().get()));
+        temp_dir_.path(), base::ThreadTaskRunnerHandle::Get()));
     ASSERT_TRUE(metadata_storage_->Initialize());
 
-    cache_.reset(new FileCache(metadata_storage_.get(),
-                               temp_dir_.path(),
-                               base::MessageLoopProxy::current().get(),
+    cache_.reset(new FileCache(metadata_storage_.get(), temp_dir_.path(),
+                               base::ThreadTaskRunnerHandle::Get(),
                                NULL /* free_disk_space_getter */));
     ASSERT_TRUE(cache_->Initialize());
 
-    metadata_.reset(new ResourceMetadata(
-        metadata_storage_.get(), cache_.get(),
-        base::MessageLoopProxy::current().get()));
+    metadata_.reset(new ResourceMetadata(metadata_storage_.get(), cache_.get(),
+                                         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(),
-                             metadata_.get(),
-                             scheduler_.get(),
-                             about_resource_loader_.get(),
-                             loader_controller_.get()));
+    change_list_loader_.reset(new ChangeListLoader(
+        logger_.get(), base::ThreadTaskRunnerHandle::Get(), metadata_.get(),
+        scheduler_.get(), about_resource_loader_.get(),
+        loader_controller_.get()));

[satorux1, 2015/05/05 16:23:23]

Please keep them aligned vertically for consistency (ex. see line AddNewFile()
call from line 111). 


Likewise, please keep the original style elsewhere as well.

[Pranay, 2015/05/08 10:21:16]

Done.

   }
 
   // Adds a new file to the root directory of the service.
   scoped_ptr<google_apis::FileResource> AddNewFile(const std::string& title) {
     google_apis::DriveApiErrorCode error = google_apis::DRIVE_FILE_ERROR;
     scoped_ptr<google_apis::FileResource> entry;
     drive_service_->AddNewFile(
         "text/plain",
         "content text",
         drive_service_->GetRootResourceId(),
@@ skipping 119 matching lines @@
 TEST_F(ChangeListLoaderTest, Load_LocalMetadataAvailable) {
   // Prepare metadata.
   FileError error = FILE_ERROR_FAILED;
   change_list_loader_->LoadIfNeeded(
       google_apis::test_util::CreateCopyResultCallback(&error));
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(FILE_ERROR_OK, error);
 
   // Reset loader.
   about_resource_loader_.reset(new AboutResourceLoader(scheduler_.get()));
-  change_list_loader_.reset(
-      new ChangeListLoader(logger_.get(),
-                           base::MessageLoopProxy::current().get(),
-                           metadata_.get(),
-                           scheduler_.get(),
-                           about_resource_loader_.get(),
-                           loader_controller_.get()));
+  change_list_loader_.reset(new ChangeListLoader(
+      logger_.get(), base::ThreadTaskRunnerHandle::Get(), metadata_.get(),
+      scheduler_.get(), about_resource_loader_.get(),
+      loader_controller_.get()));
 
   // Add a file to the service.
   scoped_ptr<google_apis::FileResource> gdata_entry = AddNewFile("New File");
   ASSERT_TRUE(gdata_entry);
 
   // Start loading. Because local metadata is available, the load results in
   // returning FILE_ERROR_OK without fetching full list of resources.
   const int previous_file_list_load_count =
       drive_service_->file_list_load_count();
   TestChangeListLoaderObserver observer(change_list_loader_.get());
@@ skipping 124 matching lines @@
 
   // Unlock the loader, this should resume the pending update.
   lock.reset();
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(
       observer.changed_files().CountDirectory(util::GetDriveMyDriveRootPath()));
 }
 
 }  // namespace internal
 }  // namespace drive