[SyncFS] Remove using MessageLoop in classes which will live in a worker thread.

BUG=347425
TEST=./unit_tests --gtest_filter="DriveBackend*:SyncEngine*:Conflict*:RegisterApp*:RemoteTo*:LocalTo*:ListChange*:MetadataDatabase*:TaskDep*"

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271663 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc

@@ -93,7 +93,6 @@ class ConflictResolverTest : public testing::Test {
   void InitializeMetadataDatabase() {
     SyncEngineInitializer* initializer =
         new SyncEngineInitializer(context_.get(),
-                                  base::MessageLoopProxy::current(),
                                   database_dir_.path(),
                                   in_memory_env_.get());
     SyncStatusCode status = SYNC_STATUS_UNKNOWN;

chrome/browser/sync_file_system/drive_backend/list_changes_task_unittest.cc

@@ -166,11 +166,9 @@ class ListChangesTaskTest : public testing::Test {
   void InitializeMetadataDatabase() {
     SyncStatusCode status = SYNC_STATUS_UNKNOWN;
     SyncEngineInitializer* initializer =
-        new SyncEngineInitializer(
-            context_.get(),
-            base::MessageLoopProxy::current(),
-            database_dir_.path(),
-            in_memory_env_.get());
+        new SyncEngineInitializer(context_.get(),
+                                  database_dir_.path(),
+                                  in_memory_env_.get());
 
     sync_task_manager_->ScheduleSyncTask(
         FROM_HERE, scoped_ptr<SyncTask>(initializer),

chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc

@@ -93,7 +93,6 @@ class LocalToRemoteSyncerTest : public testing::Test {
   void InitializeMetadataDatabase() {
     SyncEngineInitializer* initializer =
         new SyncEngineInitializer(context_.get(),
-                                  base::MessageLoopProxy::current(),
                                   database_dir_.path(),
                                   in_memory_env_.get());
     SyncStatusCode status = SYNC_STATUS_UNKNOWN;

chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.cc

@@ -113,7 +113,7 @@ void RemoteToLocalSyncer::RunExclusive(const SyncStatusCallback& callback) {
 
   util::Log(logging::LOG_VERBOSE, FROM_HERE,
             "[Remote -> Local] Nothing to do.");
-  base::MessageLoopProxy::current()->PostTask(
+  sync_context_->GetWorkerTaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(callback, SYNC_STATUS_NO_CHANGE_TO_SYNC));
 }

chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc

@@ -94,11 +94,9 @@ class RemoteToLocalSyncerTest : public testing::Test {
 
   void InitializeMetadataDatabase() {
     SyncEngineInitializer* initializer =
-        new SyncEngineInitializer(
-            context_.get(),
-            base::MessageLoopProxy::current(),
-            database_dir_.path(),
-            in_memory_env_.get());
+        new SyncEngineInitializer(context_.get(),
+                                  database_dir_.path(),
+                                  in_memory_env_.get());
     SyncStatusCode status = SYNC_STATUS_UNKNOWN;
     sync_task_manager_->ScheduleSyncTask(
         FROM_HERE,

chrome/browser/sync_file_system/drive_backend/sync_engine.h

@@ -44,12 +44,9 @@ namespace drive_backend {
 
 class DriveServiceWrapper;
 class DriveUploaderWrapper;
-class LocalToRemoteSyncer;
 class MetadataDatabase;
 class RemoteChangeProcessorOnWorker;
 class RemoteChangeProcessorWrapper;
-class RemoteToLocalSyncer;
-class SyncEngineInitializer;
 class SyncTaskManager;
 class SyncWorker;
 

chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc

@@ -77,18 +77,15 @@ ScopedVector<google_apis::FileResource> ConvertResourceEntriesToFileResources(
 
 SyncEngineInitializer::SyncEngineInitializer(
     SyncEngineContext* sync_context,
-    base::SequencedTaskRunner* task_runner,
     const base::FilePath& database_path,
     leveldb::Env* env_override)
     : sync_context_(sync_context),
       env_override_(env_override),
-      task_runner_(task_runner),
       database_path_(database_path),
       find_sync_root_retry_count_(0),
       largest_change_id_(0),
       weak_ptr_factory_(this) {
   DCHECK(sync_context);
-  DCHECK(task_runner);
 }
 
 SyncEngineInitializer::~SyncEngineInitializer() {
@@ -109,13 +106,11 @@ void SyncEngineInitializer::RunPreflight(scoped_ptr<SyncTaskToken> token) {
     return;
   }
 
-  // TODO(tzik): Stop using MessageLoopProxy before moving out from UI thread.
-  scoped_refptr<base::SequencedTaskRunner> worker_task_runner(
-      base::MessageLoopProxy::current());
-
   MetadataDatabase::Create(
-      worker_task_runner.get(),
-      task_runner_.get(), database_path_, env_override_,
+      sync_context_->GetWorkerTaskRunner(),
+      sync_context_->GetFileTaskRunner(),
+      database_path_,
+      env_override_,
       base::Bind(&SyncEngineInitializer::DidCreateMetadataDatabase,
                  weak_ptr_factory_.GetWeakPtr(), base::Passed(&token)));
 }

chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.h

@@ -11,7 +11,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
-#include "base/sequenced_task_runner.h"
 #include "chrome/browser/sync_file_system/drive_backend/sync_task.h"
 #include "chrome/browser/sync_file_system/sync_callbacks.h"
 #include "google_apis/drive/drive_common_callbacks.h"
@@ -67,7 +66,6 @@ class SyncEngineContext;
 class SyncEngineInitializer : public SyncTask {
  public:
   SyncEngineInitializer(SyncEngineContext* sync_context,
-                        base::SequencedTaskRunner* task_runner,
                         const base::FilePath& database_path,
                         leveldb::Env* env_override);
   virtual ~SyncEngineInitializer();
@@ -110,7 +108,6 @@ class SyncEngineInitializer : public SyncTask {
   SyncEngineContext* sync_context_;  // Not owned.
   leveldb::Env* env_override_;
 
-  scoped_refptr<base::SequencedTaskRunner> task_runner_;
   google_apis::CancelCallback cancel_callback_;
   base::FilePath database_path_;
 

chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc

@@ -77,11 +77,9 @@ class SyncEngineInitializerTest : public testing::Test {
 
   SyncStatusCode RunInitializer() {
     SyncEngineInitializer* initializer =
-        new SyncEngineInitializer(
-            sync_context_.get(),
-            base::MessageLoopProxy::current(),
-            database_path(),
-            in_memory_env_.get());
+        new SyncEngineInitializer(sync_context_.get(),
+                                  database_path(),
+                                  in_memory_env_.get());
     SyncStatusCode status = SYNC_STATUS_UNKNOWN;
 
     sync_task_manager_->ScheduleSyncTask(

chrome/browser/sync_file_system/drive_backend/sync_worker.cc

@@ -427,7 +427,6 @@ void SyncWorker::PostInitializeTask() {
   // already initialized when it runs.
   SyncEngineInitializer* initializer =
       new SyncEngineInitializer(context_.get(),
-                                context_->GetFileTaskRunner(),
                                 base_dir_.Append(kDatabaseName),
                                 env_override_);
   task_manager_->ScheduleSyncTask(