| Index: components/drive/file_system_unittest.cc
|
| diff --git a/components/drive/file_system_unittest.cc b/components/drive/file_system_unittest.cc
|
| index a502a2a55c135d8b7722aa07c7544723946065b9..b43cf82cf2c7717530dce4a06ce7babd7f7c5b9f 100644
|
| --- a/components/drive/file_system_unittest.cc
|
| +++ b/components/drive/file_system_unittest.cc
|
| @@ -4,6 +4,9 @@
|
|
|
| #include "components/drive/file_system.h"
|
|
|
| +#include <stddef.h>
|
| +#include <stdint.h>
|
| +
|
| #include <string>
|
| #include <vector>
|
|
|
| @@ -11,6 +14,7 @@
|
| #include "base/files/file_path.h"
|
| #include "base/files/file_util.h"
|
| #include "base/files/scoped_temp_dir.h"
|
| +#include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/prefs/testing_pref_service.h"
|
| #include "base/run_loop.h"
|
| @@ -241,8 +245,10 @@ class FileSystemTest : public testing::Test {
|
|
|
| ASSERT_EQ(FILE_ERROR_OK, resource_metadata->Initialize());
|
|
|
| - const int64 changestamp = param == USE_SERVER_TIMESTAMP ?
|
| - fake_drive_service_->about_resource().largest_change_id() : 1;
|
| + const int64_t changestamp =
|
| + param == USE_SERVER_TIMESTAMP
|
| + ? fake_drive_service_->about_resource().largest_change_id()
|
| + : 1;
|
| ASSERT_EQ(FILE_ERROR_OK,
|
| resource_metadata->SetLargestChangestamp(changestamp));
|
|
|
| @@ -562,7 +568,7 @@ TEST_F(FileSystemTest, TruncateFile) {
|
| scoped_ptr<ResourceEntry> entry = GetResourceEntrySync(file_path);
|
| ASSERT_TRUE(entry);
|
|
|
| - const int64 kLength = entry->file_info().size() + 100;
|
| + const int64_t kLength = entry->file_info().size() + 100;
|
|
|
| FileError error = FILE_ERROR_FAILED;
|
| file_system_->TruncateFile(
|
| @@ -962,8 +968,8 @@ TEST_F(FileSystemTest, PinAndUnpin_NotSynced) {
|
|
|
| TEST_F(FileSystemTest, GetAvailableSpace) {
|
| FileError error = FILE_ERROR_OK;
|
| - int64 bytes_total;
|
| - int64 bytes_used;
|
| + int64_t bytes_total;
|
| + int64_t bytes_used;
|
| file_system_->GetAvailableSpace(
|
| google_apis::test_util::CreateCopyResultCallback(
|
| &error, &bytes_total, &bytes_used));
|
|
|