Revert of [SyncFS] Post tasks between SyncEngine and SyncWorker

chrome/browser/sync_file_system/drive_backend/sync_worker.cc

 // Copyright 2014 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/sync_file_system/drive_backend/sync_worker.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 81 matching lines @@
 
 void SyncWorker::RegisterOrigin(
     const GURL& origin,
     const SyncStatusCallback& callback) {
   if (!GetMetadataDatabase() && GetDriveService()->HasRefreshToken())
     PostInitializeTask();
 
   scoped_ptr<RegisterAppTask> task(
       new RegisterAppTask(context_.get(), origin.host()));
   if (task->CanFinishImmediately()) {
-    context_->GetUiTaskRunner()->PostTask(
-        FROM_HERE, base::Bind(callback, SYNC_STATUS_OK));
+    callback.Run(SYNC_STATUS_OK);
     return;
   }
 
-  // TODO(peria): Forward |callback| to UI thread.
   task_manager_->ScheduleSyncTask(
       FROM_HERE,
       task.PassAs<SyncTask>(),
       SyncTaskManager::PRIORITY_HIGH,
       callback);
 }
 
 void SyncWorker::EnableOrigin(
     const GURL& origin,
     const SyncStatusCallback& callback) {
-  // TODO(peria): Forward |callback| to UI thread.
   task_manager_->ScheduleTask(
       FROM_HERE,
       base::Bind(&SyncWorker::DoEnableApp,
                  weak_ptr_factory_.GetWeakPtr(),
                  origin.host()),
       SyncTaskManager::PRIORITY_HIGH,
       callback);
 }
 
 void SyncWorker::DisableOrigin(
     const GURL& origin,
     const SyncStatusCallback& callback) {
-  // TODO(peria): Forward |callback| to UI thread.
   task_manager_->ScheduleTask(
       FROM_HERE,
       base::Bind(&SyncWorker::DoDisableApp,
                  weak_ptr_factory_.GetWeakPtr(),
                  origin.host()),
       SyncTaskManager::PRIORITY_HIGH,
       callback);
 }
 
 void SyncWorker::UninstallOrigin(
     const GURL& origin,
     RemoteFileSyncService::UninstallFlag flag,
     const SyncStatusCallback& callback) {
-  // TODO(peria): Forward |callback| to UI thread.
   task_manager_->ScheduleSyncTask(
       FROM_HERE,
       scoped_ptr<SyncTask>(
           new UninstallAppTask(context_.get(), origin.host(), flag)),
       SyncTaskManager::PRIORITY_HIGH,
       callback);
 }
 
 void SyncWorker::ProcessRemoteChange(
     const SyncFileCallback& callback) {
@@ skipping 53 matching lines @@
 
 void SyncWorker::SetSyncEnabled(bool enabled) {
   if (sync_enabled_ == enabled)
     return;
 
   RemoteServiceState old_state = GetCurrentState();
   sync_enabled_ = enabled;
   if (old_state == GetCurrentState())
     return;
 
-  context_->GetUiTaskRunner()->PostTask(
-      FROM_HERE,
-      base::Bind(&SyncEngine::UpdateSyncEnabled, sync_engine_, enabled));
+  // TODO(peria): PostTask()
+  sync_engine_->UpdateSyncEnabled(enabled);
 }
 
 SyncStatusCode SyncWorker::SetDefaultConflictResolutionPolicy(
     ConflictResolutionPolicy policy) {
   default_conflict_resolution_policy_ = policy;
   return SYNC_STATUS_OK;
 }
 
 SyncStatusCode SyncWorker::SetConflictResolutionPolicy(
     const GURL& origin,
@@ skipping 41 matching lines @@
 
   MaybeStartFetchChanges();
 }
 
 void SyncWorker::NotifyLastOperationStatus(
     SyncStatusCode status,
     bool used_network) {
   UpdateServiceStateFromSyncStatusCode(status, used_network);
 
   if (GetMetadataDatabase()) {
-    context_->GetUiTaskRunner()->PostTask(
-        FROM_HERE,
-        base::Bind(&SyncEngine::NotifyLastOperationStatus, sync_engine_));
+    // TODO(peria): Post task
+    sync_engine_->NotifyLastOperationStatus();
   }
 }
 
 void SyncWorker::OnNotificationReceived() {
   if (service_state_ == REMOTE_SERVICE_TEMPORARY_UNAVAILABLE)
     UpdateServiceState(REMOTE_SERVICE_OK, "Got push notification for Drive.");
 
   should_check_remote_change_ = true;
   MaybeScheduleNextTask();
 }
@@ skipping 64 matching lines @@
       sync_enabled_(false),
       default_conflict_resolution_policy_(
           CONFLICT_RESOLUTION_POLICY_LAST_WRITE_WIN),
       network_available_(false),
       context_(sync_engine_context.Pass()),
       sync_engine_(sync_engine),
       weak_ptr_factory_(this) {}
 
 void SyncWorker::DoDisableApp(const std::string& app_id,
                               const SyncStatusCallback& callback) {
-  if (GetMetadataDatabase()) {
+  if (GetMetadataDatabase())
     GetMetadataDatabase()->DisableApp(app_id, callback);
-  } else {
-    context_->GetUiTaskRunner()->PostTask(
-        FROM_HERE, base::Bind(callback, SYNC_STATUS_OK));
-  }
+  else
+    callback.Run(SYNC_STATUS_OK);
 }
 
 void SyncWorker::DoEnableApp(const std::string& app_id,
                              const SyncStatusCallback& callback) {
-  if (GetMetadataDatabase()) {
+  if (GetMetadataDatabase())
     GetMetadataDatabase()->EnableApp(app_id, callback);
-  } else {
-    context_->GetUiTaskRunner()->PostTask(
-        FROM_HERE, base::Bind(callback, SYNC_STATUS_OK));
-  }
+  else
+    callback.Run(SYNC_STATUS_OK);
 }
 
 void SyncWorker::PostInitializeTask() {
   DCHECK(!GetMetadataDatabase());
 
   // This initializer task may not run if MetadataDatabase in context_ is
   // already initialized when it runs.
   SyncEngineInitializer* initializer =
       new SyncEngineInitializer(context_.get(),
-                                context_->GetFileTaskRunner(),
+                                context_->GetBlockingTaskRunner(),
                                 base_dir_.Append(kDatabaseName),
                                 env_override_);
   task_manager_->ScheduleSyncTask(
       FROM_HERE,
       scoped_ptr<SyncTask>(initializer),
       SyncTaskManager::PRIORITY_HIGH,
-      base::Bind(&SyncWorker::DidInitialize,
-                 weak_ptr_factory_.GetWeakPtr(),
+      base::Bind(&SyncWorker::DidInitialize, weak_ptr_factory_.GetWeakPtr(),
                  initializer));
 }
 
 void SyncWorker::DidInitialize(SyncEngineInitializer* initializer,
                                SyncStatusCode status) {
   if (status != SYNC_STATUS_OK) {
     if (GetDriveService()->HasRefreshToken()) {
       UpdateServiceState(REMOTE_SERVICE_TEMPORARY_UNAVAILABLE,
                          "Could not initialize remote service");
     } else {
       UpdateServiceState(REMOTE_SERVICE_AUTHENTICATION_REQUIRED,
                          "Authentication required.");
     }
     return;
   }
 
   scoped_ptr<MetadataDatabase> metadata_database =
       initializer->PassMetadataDatabase();
   if (metadata_database)
     context_->SetMetadataDatabase(metadata_database.Pass());
 
-  context_->GetUiTaskRunner()->PostTask(
-      FROM_HERE,
-      base::Bind(&SyncEngine::UpdateRegisteredApps, sync_engine_));
+  // TODO(peria): Post task
+  sync_engine_->UpdateRegisteredApps();
 }
 
 void SyncWorker::DidProcessRemoteChange(RemoteToLocalSyncer* syncer,
                                         const SyncFileCallback& callback,
                                         SyncStatusCode status) {
   if (syncer->is_sync_root_deletion()) {
     MetadataDatabase::ClearDatabase(context_->PassMetadataDatabase());
     PostInitializeTask();
-    context_->GetUiTaskRunner()->PostTask(
-        FROM_HERE, base::Bind(callback, status, syncer->url()));
+    callback.Run(status, syncer->url());
     return;
   }
 
   if (status == SYNC_STATUS_OK) {
-    context_->GetUiTaskRunner()->PostTask(
-        FROM_HERE,
-        base::Bind(&SyncEngine::DidProcessRemoteChange, sync_engine_, syncer));
+    // TODO(peria): Post task
+    sync_engine_->DidProcessRemoteChange(syncer);
 
     if (syncer->sync_action() == SYNC_ACTION_DELETED &&
         syncer->url().is_valid() &&
         fileapi::VirtualPath::IsRootPath(syncer->url().path())) {
       RegisterOrigin(syncer->url().origin(), base::Bind(&EmptyStatusCallback));
     }
     should_check_conflict_ = true;
   }
-
-  context_->GetUiTaskRunner()->PostTask(
-      FROM_HERE,
-      base::Bind(callback, status, syncer->url()));
+  callback.Run(status, syncer->url());
 }
 
 void SyncWorker::DidApplyLocalChange(LocalToRemoteSyncer* syncer,
                                      const SyncStatusCallback& callback,
                                      SyncStatusCode status) {
-  // TODO(peria): PostTask (Simple replace fails DriveBackendSync* tests)
+  // TODO(peria): Post task
   sync_engine_->DidApplyLocalChange(syncer, status);
 
   if (status == SYNC_STATUS_UNKNOWN_ORIGIN && syncer->url().is_valid()) {
     RegisterOrigin(syncer->url().origin(),
                    base::Bind(&EmptyStatusCallback));
   }
 
   if (syncer->needs_remote_change_listing() &&
       !listing_remote_changes_) {
     task_manager_->ScheduleSyncTask(
         FROM_HERE,
         scoped_ptr<SyncTask>(new ListChangesTask(context_.get())),
         SyncTaskManager::PRIORITY_HIGH,
         base::Bind(&SyncWorker::DidFetchChanges,
                    weak_ptr_factory_.GetWeakPtr()));
     should_check_remote_change_ = false;
     listing_remote_changes_ = true;
     time_to_check_changes_ =
         base::TimeTicks::Now() +
         base::TimeDelta::FromSeconds(kListChangesRetryDelaySeconds);
   }
 
+  if (status != SYNC_STATUS_OK &&
+      status != SYNC_STATUS_NO_CHANGE_TO_SYNC) {
+    callback.Run(status);
+    return;
+  }
+
   if (status == SYNC_STATUS_OK)
     should_check_conflict_ = true;
 
-  context_->GetUiTaskRunner()->PostTask(
-      FROM_HERE, base::Bind(callback, status));
+  callback.Run(status);
 }
 
 void SyncWorker::MaybeStartFetchChanges() {
   if (GetCurrentState() == REMOTE_SERVICE_DISABLED)
     return;
 
   if (!GetMetadataDatabase())
     return;
 
   if (listing_remote_changes_)
@@ skipping 89 matching lines @@
                                     const std::string& description) {
   RemoteServiceState old_state = GetCurrentState();
   service_state_ = state;
 
   if (old_state == GetCurrentState())
     return;
 
   util::Log(logging::LOG_VERBOSE, FROM_HERE,
             "Service state changed: %d->%d: %s",
             old_state, GetCurrentState(), description.c_str());
-
-  context_->GetUiTaskRunner()->PostTask(
-      FROM_HERE,
-      base::Bind(&SyncEngine::UpdateServiceState, sync_engine_, description));
+  // TODO(peria): Post task
+  sync_engine_->UpdateServiceState(description);
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system