| Index: chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.cc b/chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.cc
|
| index 2904e2679a19f38bcb4758162085f3b9f98f158d..4f13ff0ce656523096666f0a4768c8db076fd32d 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.cc
|
| +++ b/chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.cc
|
| @@ -88,12 +88,12 @@ scoped_ptr<FileMetadata> CreateFileMetadata(const std::string& file_id,
|
| }
|
|
|
| scoped_ptr<FileTracker> CreateTracker(const FileMetadata& metadata,
|
| - int64 tracker_id,
|
| + int64_t tracker_id,
|
| const FileTracker* parent_tracker) {
|
| scoped_ptr<FileTracker> tracker(new FileTracker);
|
| tracker->set_tracker_id(tracker_id);
|
| - int64 parent_id = parent_tracker ?
|
| - parent_tracker->tracker_id() : kInvalidTrackerID;
|
| + int64_t parent_id =
|
| + parent_tracker ? parent_tracker->tracker_id() : kInvalidTrackerID;
|
| tracker->set_parent_tracker_id(parent_id);
|
| tracker->set_file_id(metadata.file_id());
|
| if (parent_tracker)
|
| @@ -108,7 +108,7 @@ scoped_ptr<FileTracker> CreateTracker(const FileMetadata& metadata,
|
|
|
| scoped_ptr<FileTracker> CreatePlaceholderTracker(
|
| const std::string& file_id,
|
| - int64 tracker_id,
|
| + int64_t tracker_id,
|
| const FileTracker* parent_tracker) {
|
| scoped_ptr<FileTracker> tracker(new FileTracker);
|
| tracker->set_tracker_id(tracker_id);
|
|
|