| Index: chrome/browser/sync_file_system/local/syncable_file_system_operation.cc
|
| diff --git a/chrome/browser/sync_file_system/local/syncable_file_system_operation.cc b/chrome/browser/sync_file_system/local/syncable_file_system_operation.cc
|
| index 1c19b9cec4fe074fe4be00045a174d903f9de39a..56243eef1fcd6c9f7effec49223fc2b34e7caf59 100644
|
| --- a/chrome/browser/sync_file_system/local/syncable_file_system_operation.cc
|
| +++ b/chrome/browser/sync_file_system/local/syncable_file_system_operation.cc
|
| @@ -5,6 +5,7 @@
|
| #include "chrome/browser/sync_file_system/local/syncable_file_system_operation.h"
|
|
|
| #include "base/logging.h"
|
| +#include "base/macros.h"
|
| #include "chrome/browser/sync_file_system/local/local_file_sync_context.h"
|
| #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h"
|
| #include "chrome/browser/sync_file_system/local/syncable_file_operation_runner.h"
|
| @@ -237,9 +238,9 @@ void SyncableFileSystemOperation::Write(
|
| operation_runner_->PostOperationTask(task.Pass());
|
| }
|
|
|
| -void SyncableFileSystemOperation::Truncate(
|
| - const FileSystemURL& url, int64 length,
|
| - const StatusCallback& callback) {
|
| +void SyncableFileSystemOperation::Truncate(const FileSystemURL& url,
|
| + int64_t length,
|
| + const StatusCallback& callback) {
|
| DCHECK(CalledOnValidThread());
|
| if (!operation_runner_.get()) {
|
| callback.Run(base::File::FILE_ERROR_NOT_FOUND);
|
| @@ -374,11 +375,10 @@ void SyncableFileSystemOperation::DidFinish(base::File::Error status) {
|
| completion_callback_.Run(status);
|
| }
|
|
|
| -void SyncableFileSystemOperation::DidWrite(
|
| - const WriteCallback& callback,
|
| - base::File::Error result,
|
| - int64 bytes,
|
| - bool complete) {
|
| +void SyncableFileSystemOperation::DidWrite(const WriteCallback& callback,
|
| + base::File::Error result,
|
| + int64_t bytes,
|
| + bool complete) {
|
| DCHECK(CalledOnValidThread());
|
| if (!complete) {
|
| callback.Run(result, bytes, complete);
|
|
|