Index: chrome/browser/sync_file_system/drive_backend/sync_engine.cc |
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc |
index ac1af18286ab54ff95581d9013282db4830b870e..5f8fee8ac00a83a7e70e4544716c409e2c6e8e58 100644 |
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc |
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc |
@@ -126,10 +126,8 @@ class SyncEngine::WorkerObserver : public SyncWorkerInterface::Observer { |
DCHECK(sequence_checker_.CalledOnValidSequence()); |
ui_task_runner_->PostTask( |
- FROM_HERE, |
- base::Bind(&SyncEngine::OnPendingFileListUpdated, |
- sync_engine_, |
- item_count)); |
+ FROM_HERE, base::BindOnce(&SyncEngine::OnPendingFileListUpdated, |
+ sync_engine_, item_count)); |
} |
void OnFileStatusChanged(const storage::FileSystemURL& url, |
@@ -147,9 +145,8 @@ class SyncEngine::WorkerObserver : public SyncWorkerInterface::Observer { |
DCHECK(sequence_checker_.CalledOnValidSequence()); |
ui_task_runner_->PostTask( |
FROM_HERE, |
- base::Bind(&SyncEngine::OnFileStatusChanged, |
- sync_engine_, |
- url, file_type, file_status, sync_action, direction)); |
+ base::BindOnce(&SyncEngine::OnFileStatusChanged, sync_engine_, url, |
+ file_type, file_status, sync_action, direction)); |
} |
void UpdateServiceState(RemoteServiceState state, |
@@ -162,9 +159,8 @@ class SyncEngine::WorkerObserver : public SyncWorkerInterface::Observer { |
DCHECK(sequence_checker_.CalledOnValidSequence()); |
ui_task_runner_->PostTask( |
- FROM_HERE, |
- base::Bind(&SyncEngine::UpdateServiceState, |
- sync_engine_, state, description)); |
+ FROM_HERE, base::BindOnce(&SyncEngine::UpdateServiceState, sync_engine_, |
+ state, description)); |
} |
void DetachFromSequence() { |
@@ -345,10 +341,9 @@ void SyncEngine::InitializeInternal( |
sync_worker_->AddObserver(worker_observer_.get()); |
worker_task_runner_->PostTask( |
- FROM_HERE, |
- base::Bind(&SyncWorkerInterface::Initialize, |
- base::Unretained(sync_worker_.get()), |
- base::Passed(&sync_engine_context))); |
+ FROM_HERE, base::BindOnce(&SyncWorkerInterface::Initialize, |
+ base::Unretained(sync_worker_.get()), |
+ base::Passed(&sync_engine_context))); |
if (remote_change_processor_) |
SetRemoteChangeProcessor(remote_change_processor_); |
@@ -387,10 +382,9 @@ void SyncEngine::RegisterOrigin(const GURL& origin, |
TrackCallback(callback))); |
worker_task_runner_->PostTask( |
- FROM_HERE, |
- base::Bind(&SyncWorkerInterface::RegisterOrigin, |
- base::Unretained(sync_worker_.get()), |
- origin, relayed_callback)); |
+ FROM_HERE, base::BindOnce(&SyncWorkerInterface::RegisterOrigin, |
+ base::Unretained(sync_worker_.get()), origin, |
+ relayed_callback)); |
} |
void SyncEngine::EnableOrigin( |
@@ -406,10 +400,9 @@ void SyncEngine::EnableOrigin( |
FROM_HERE, TrackCallback(callback)); |
worker_task_runner_->PostTask( |
- FROM_HERE, |
- base::Bind(&SyncWorkerInterface::EnableOrigin, |
- base::Unretained(sync_worker_.get()), |
- origin, relayed_callback)); |
+ FROM_HERE, base::BindOnce(&SyncWorkerInterface::EnableOrigin, |
+ base::Unretained(sync_worker_.get()), origin, |
+ relayed_callback)); |
} |
void SyncEngine::DisableOrigin( |
@@ -425,11 +418,9 @@ void SyncEngine::DisableOrigin( |
FROM_HERE, TrackCallback(callback)); |
worker_task_runner_->PostTask( |
- FROM_HERE, |
- base::Bind(&SyncWorkerInterface::DisableOrigin, |
- base::Unretained(sync_worker_.get()), |
- origin, |
- relayed_callback)); |
+ FROM_HERE, base::BindOnce(&SyncWorkerInterface::DisableOrigin, |
+ base::Unretained(sync_worker_.get()), origin, |
+ relayed_callback)); |
} |
void SyncEngine::UninstallOrigin( |
@@ -446,10 +437,9 @@ void SyncEngine::UninstallOrigin( |
SyncStatusCallback relayed_callback = RelayCallbackToCurrentThread( |
FROM_HERE, TrackCallback(callback)); |
worker_task_runner_->PostTask( |
- FROM_HERE, |
- base::Bind(&SyncWorkerInterface::UninstallOrigin, |
- base::Unretained(sync_worker_.get()), |
- origin, flag, relayed_callback)); |
+ FROM_HERE, base::BindOnce(&SyncWorkerInterface::UninstallOrigin, |
+ base::Unretained(sync_worker_.get()), origin, |
+ flag, relayed_callback)); |
} |
void SyncEngine::ProcessRemoteChange(const SyncFileCallback& callback) { |
@@ -472,9 +462,8 @@ void SyncEngine::ProcessRemoteChange(const SyncFileCallback& callback) { |
FROM_HERE, tracked_callback); |
worker_task_runner_->PostTask( |
FROM_HERE, |
- base::Bind(&SyncWorkerInterface::ProcessRemoteChange, |
- base::Unretained(sync_worker_.get()), |
- relayed_callback)); |
+ base::BindOnce(&SyncWorkerInterface::ProcessRemoteChange, |
+ base::Unretained(sync_worker_.get()), relayed_callback)); |
} |
void SyncEngine::SetRemoteChangeProcessor(RemoteChangeProcessor* processor) { |
@@ -492,10 +481,9 @@ void SyncEngine::SetRemoteChangeProcessor(RemoteChangeProcessor* processor) { |
worker_task_runner_.get())); |
worker_task_runner_->PostTask( |
- FROM_HERE, |
- base::Bind(&SyncWorkerInterface::SetRemoteChangeProcessor, |
- base::Unretained(sync_worker_.get()), |
- remote_change_processor_on_worker_.get())); |
+ FROM_HERE, base::BindOnce(&SyncWorkerInterface::SetRemoteChangeProcessor, |
+ base::Unretained(sync_worker_.get()), |
+ remote_change_processor_on_worker_.get())); |
} |
LocalChangeProcessor* SyncEngine::GetLocalChangeProcessor() { |
@@ -526,9 +514,8 @@ void SyncEngine::GetOriginStatusMap(const StatusMapCallback& callback) { |
worker_task_runner_->PostTask( |
FROM_HERE, |
- base::Bind(&SyncWorkerInterface::GetOriginStatusMap, |
- base::Unretained(sync_worker_.get()), |
- relayed_callback)); |
+ base::BindOnce(&SyncWorkerInterface::GetOriginStatusMap, |
+ base::Unretained(sync_worker_.get()), relayed_callback)); |
} |
void SyncEngine::DumpFiles(const GURL& origin, |
@@ -586,9 +573,8 @@ void SyncEngine::SetSyncEnabled(bool sync_enabled) { |
worker_task_runner_->PostTask( |
FROM_HERE, |
- base::Bind(&SyncWorkerInterface::SetSyncEnabled, |
- base::Unretained(sync_worker_.get()), |
- sync_enabled_)); |
+ base::BindOnce(&SyncWorkerInterface::SetSyncEnabled, |
+ base::Unretained(sync_worker_.get()), sync_enabled_)); |
return; |
} |
@@ -599,9 +585,8 @@ void SyncEngine::SetSyncEnabled(bool sync_enabled) { |
// let SyncEngine handle the flag. |
worker_task_runner_->PostTask( |
FROM_HERE, |
- base::Bind(&SyncWorkerInterface::SetSyncEnabled, |
- base::Unretained(sync_worker_.get()), |
- sync_enabled_)); |
+ base::BindOnce(&SyncWorkerInterface::SetSyncEnabled, |
+ base::Unretained(sync_worker_.get()), sync_enabled_)); |
Reset(); |
} |
@@ -616,9 +601,8 @@ void SyncEngine::PromoteDemotedChanges(const base::Closure& callback) { |
worker_task_runner_->PostTask( |
FROM_HERE, |
- base::Bind(&SyncWorkerInterface::PromoteDemotedChanges, |
- base::Unretained(sync_worker_.get()), |
- relayed_callback)); |
+ base::BindOnce(&SyncWorkerInterface::PromoteDemotedChanges, |
+ base::Unretained(sync_worker_.get()), relayed_callback)); |
} |
void SyncEngine::ApplyLocalChange(const FileChange& local_change, |
@@ -640,13 +624,9 @@ void SyncEngine::ApplyLocalChange(const FileChange& local_change, |
FROM_HERE, TrackCallback(callback)); |
worker_task_runner_->PostTask( |
FROM_HERE, |
- base::Bind(&SyncWorkerInterface::ApplyLocalChange, |
- base::Unretained(sync_worker_.get()), |
- local_change, |
- local_path, |
- local_metadata, |
- url, |
- relayed_callback)); |
+ base::BindOnce(&SyncWorkerInterface::ApplyLocalChange, |
+ base::Unretained(sync_worker_.get()), local_change, |
+ local_path, local_metadata, url, relayed_callback)); |
} |
void SyncEngine::OnNotificationReceived() { |
@@ -655,10 +635,9 @@ void SyncEngine::OnNotificationReceived() { |
worker_task_runner_->PostTask( |
FROM_HERE, |
- base::Bind(&SyncWorkerInterface::ActivateService, |
- base::Unretained(sync_worker_.get()), |
- REMOTE_SERVICE_OK, |
- "Got push notification for Drive")); |
+ base::BindOnce(&SyncWorkerInterface::ActivateService, |
+ base::Unretained(sync_worker_.get()), REMOTE_SERVICE_OK, |
+ "Got push notification for Drive")); |
} |
void SyncEngine::OnPushNotificationEnabled(bool /* enabled */) {} |
@@ -669,11 +648,9 @@ void SyncEngine::OnReadyToSendRequests() { |
return; |
worker_task_runner_->PostTask( |
- FROM_HERE, |
- base::Bind(&SyncWorkerInterface::ActivateService, |
- base::Unretained(sync_worker_.get()), |
- REMOTE_SERVICE_OK, |
- "Authenticated")); |
+ FROM_HERE, base::BindOnce(&SyncWorkerInterface::ActivateService, |
+ base::Unretained(sync_worker_.get()), |
+ REMOTE_SERVICE_OK, "Authenticated")); |
} |
void SyncEngine::OnRefreshTokenInvalid() { |
@@ -682,10 +659,9 @@ void SyncEngine::OnRefreshTokenInvalid() { |
return; |
worker_task_runner_->PostTask( |
- FROM_HERE, |
- base::Bind(&SyncWorkerInterface::DeactivateService, |
- base::Unretained(sync_worker_.get()), |
- "Found invalid refresh token.")); |
+ FROM_HERE, base::BindOnce(&SyncWorkerInterface::DeactivateService, |
+ base::Unretained(sync_worker_.get()), |
+ "Found invalid refresh token.")); |
} |
void SyncEngine::OnNetworkChanged( |
@@ -698,17 +674,14 @@ void SyncEngine::OnNetworkChanged( |
if (!network_available_old && network_available_) { |
worker_task_runner_->PostTask( |
- FROM_HERE, |
- base::Bind(&SyncWorkerInterface::ActivateService, |
- base::Unretained(sync_worker_.get()), |
- REMOTE_SERVICE_OK, |
- "Connected")); |
+ FROM_HERE, base::BindOnce(&SyncWorkerInterface::ActivateService, |
+ base::Unretained(sync_worker_.get()), |
+ REMOTE_SERVICE_OK, "Connected")); |
} else if (network_available_old && !network_available_) { |
worker_task_runner_->PostTask( |
FROM_HERE, |
- base::Bind(&SyncWorkerInterface::DeactivateService, |
- base::Unretained(sync_worker_.get()), |
- "Disconnected")); |
+ base::BindOnce(&SyncWorkerInterface::DeactivateService, |
+ base::Unretained(sync_worker_.get()), "Disconnected")); |
} |
} |