| Index: chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc
|
| index 7280f5e7986df296365e71f4af98b37b72078e55..0e15dbac4ca52f63ca1ca589292ec016f2923792 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc
|
| +++ b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc
|
| @@ -148,9 +148,16 @@ void LocalToRemoteSyncer::RunPreflight(scoped_ptr<SyncTaskToken> token) {
|
| } else if (active_ancestor_path != path) {
|
| if (!active_ancestor_path.AppendRelativePath(path, &missing_entries)) {
|
| NOTREACHED();
|
| - token->RecordLog(base::StringPrintf(
|
| - "Detected invalid ancestor: %s",
|
| - active_ancestor_path.value().c_str()));
|
| +#ifdef OS_WIN
|
| + // FilePath::StringType is std::wstring on Windows
|
| + token->RecordLog(
|
| + base::StringPrintf("Detected invalid ancestor: %ls",
|
| + active_ancestor_path.value().c_str()));
|
| +#else
|
| + token->RecordLog(
|
| + base::StringPrintf("Detected invalid ancestor: %s",
|
| + active_ancestor_path.value().c_str()));
|
| +#endif
|
| SyncTaskManager::NotifyTaskDone(token.Pass(), SYNC_STATUS_FAILED);
|
| return;
|
| }
|
|
|