| Index: chrome/browser/sync_file_system/local/local_file_sync_service.cc
|
| diff --git a/chrome/browser/sync_file_system/local/local_file_sync_service.cc b/chrome/browser/sync_file_system/local/local_file_sync_service.cc
|
| index 6b5a0117aebc5b2cf0f5dc450ce776911c6c87bd..7441b27d64c01949128a06141af7b506d07a9eb7 100644
|
| --- a/chrome/browser/sync_file_system/local/local_file_sync_service.cc
|
| +++ b/chrome/browser/sync_file_system/local/local_file_sync_service.cc
|
| @@ -247,9 +247,16 @@ void LocalFileSyncService::ApplyRemoteChange(
|
| const FileSystemURL& url,
|
| const SyncStatusCallback& callback) {
|
| DCHECK(ContainsKey(origin_to_contexts_, url.origin()));
|
| + util::Log(logging::LOG_INFO, FROM_HERE,
|
| + "[Remote->Local] ApplyRemoteChange: %s on %s",
|
| + change.DebugString().c_str(),
|
| + url.DebugString().c_str());
|
| +
|
| sync_context_->ApplyRemoteChange(
|
| origin_to_contexts_[url.origin()],
|
| - change, local_path, url, callback);
|
| + change, local_path, url,
|
| + base::Bind(&LocalFileSyncService::DidApplyRemoteChange, AsWeakPtr(),
|
| + callback));
|
| }
|
|
|
| void LocalFileSyncService::FinalizeRemoteSync(
|
| @@ -363,6 +370,15 @@ void LocalFileSyncService::RunLocalSyncCallback(
|
| callback.Run(status, url);
|
| }
|
|
|
| +void LocalFileSyncService::DidApplyRemoteChange(
|
| + const SyncStatusCallback& callback,
|
| + SyncStatusCode status) {
|
| + util::Log(logging::LOG_INFO, FROM_HERE,
|
| + "[Remote->Local] ApplyRemoteChange finished --> %s",
|
| + SyncStatusCodeToString(status));
|
| + callback.Run(status);
|
| +}
|
| +
|
| void LocalFileSyncService::DidGetFileForLocalSync(
|
| SyncStatusCode status,
|
| const LocalFileSyncInfo& sync_file_info,
|
|
|