Commit 77f760b5 authored by Thomas Guilbert's avatar Thomas Guilbert Committed by Chromium LUCI CQ

Convert LocalToRemoteSyncer::Continuation to OnceCallback

This CL changes LocalToRemoteSyncer::Continuation from Callback to
OnceCallback.

Bug: 1152272
Change-Id: Ie839b5982775429332c48d9c3930151a74f42423
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2604677
Commit-Queue: Thomas Guilbert <tguilbert@chromium.org>
Commit-Queue: Victor Costan <pwnall@chromium.org>
Auto-Submit: Thomas Guilbert <tguilbert@chromium.org>
Reviewed-by: default avatarVictor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#840307}
parent 00b1b27a
...@@ -253,7 +253,7 @@ void LocalToRemoteSyncer::RunPreflight(std::unique_ptr<SyncTaskToken> token) { ...@@ -253,7 +253,7 @@ void LocalToRemoteSyncer::RunPreflight(std::unique_ptr<SyncTaskToken> token) {
} }
void LocalToRemoteSyncer::MoveToBackground( void LocalToRemoteSyncer::MoveToBackground(
const Continuation& continuation, Continuation continuation,
std::unique_ptr<SyncTaskToken> token) { std::unique_ptr<SyncTaskToken> token) {
std::unique_ptr<TaskBlocker> blocker(new TaskBlocker); std::unique_ptr<TaskBlocker> blocker(new TaskBlocker);
blocker->app_id = url_.origin().host(); blocker->app_id = url_.origin().host();
...@@ -277,11 +277,11 @@ void LocalToRemoteSyncer::MoveToBackground( ...@@ -277,11 +277,11 @@ void LocalToRemoteSyncer::MoveToBackground(
SyncTaskManager::UpdateTaskBlocker( SyncTaskManager::UpdateTaskBlocker(
std::move(token), std::move(blocker), std::move(token), std::move(blocker),
base::BindOnce(&LocalToRemoteSyncer::ContinueAsBackgroundTask, base::BindOnce(&LocalToRemoteSyncer::ContinueAsBackgroundTask,
weak_ptr_factory_.GetWeakPtr(), continuation)); weak_ptr_factory_.GetWeakPtr(), std::move(continuation)));
} }
void LocalToRemoteSyncer::ContinueAsBackgroundTask( void LocalToRemoteSyncer::ContinueAsBackgroundTask(
const Continuation& continuation, Continuation continuation,
std::unique_ptr<SyncTaskToken> token) { std::unique_ptr<SyncTaskToken> token) {
// The SyncTask runs as a background task beyond this point. // The SyncTask runs as a background task beyond this point.
// Note that any task can run between MoveToBackground() and // Note that any task can run between MoveToBackground() and
...@@ -315,7 +315,7 @@ void LocalToRemoteSyncer::ContinueAsBackgroundTask( ...@@ -315,7 +315,7 @@ void LocalToRemoteSyncer::ContinueAsBackgroundTask(
} }
} }
continuation.Run(std::move(token)); std::move(continuation).Run(std::move(token));
} }
void LocalToRemoteSyncer::SyncCompleted(std::unique_ptr<SyncTaskToken> token, void LocalToRemoteSyncer::SyncCompleted(std::unique_ptr<SyncTaskToken> token,
......
...@@ -39,7 +39,7 @@ class SyncEngineContext; ...@@ -39,7 +39,7 @@ class SyncEngineContext;
class LocalToRemoteSyncer : public SyncTask { class LocalToRemoteSyncer : public SyncTask {
public: public:
typedef base::Callback<void(std::unique_ptr<SyncTaskToken>)> Continuation; typedef base::OnceCallback<void(std::unique_ptr<SyncTaskToken>)> Continuation;
LocalToRemoteSyncer(SyncEngineContext* sync_context, LocalToRemoteSyncer(SyncEngineContext* sync_context,
const SyncFileMetadata& local_metadata, const SyncFileMetadata& local_metadata,
...@@ -58,9 +58,9 @@ class LocalToRemoteSyncer : public SyncTask { ...@@ -58,9 +58,9 @@ class LocalToRemoteSyncer : public SyncTask {
} }
private: private:
void MoveToBackground(const Continuation& continuation, void MoveToBackground(Continuation continuation,
std::unique_ptr<SyncTaskToken> token); std::unique_ptr<SyncTaskToken> token);
void ContinueAsBackgroundTask(const Continuation& continuation, void ContinueAsBackgroundTask(Continuation continuation,
std::unique_ptr<SyncTaskToken> token); std::unique_ptr<SyncTaskToken> token);
void SyncCompleted(std::unique_ptr<SyncTaskToken> token, void SyncCompleted(std::unique_ptr<SyncTaskToken> token,
SyncStatusCode status); SyncStatusCode status);
......
...@@ -72,8 +72,6 @@ class SyncEngineInitializer : public SyncTask { ...@@ -72,8 +72,6 @@ class SyncEngineInitializer : public SyncTask {
std::unique_ptr<MetadataDatabase> PassMetadataDatabase(); std::unique_ptr<MetadataDatabase> PassMetadataDatabase();
private: private:
typedef base::Callback<void(SyncStatusCallback callback)> Task;
void GetAboutResource(std::unique_ptr<SyncTaskToken> token); void GetAboutResource(std::unique_ptr<SyncTaskToken> token);
void DidGetAboutResource( void DidGetAboutResource(
std::unique_ptr<SyncTaskToken> token, std::unique_ptr<SyncTaskToken> token,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment