Switch to standard integer types in chrome/browser/chromeos/.

chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader_unittest.cc

Index: chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader_unittest.cc
diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader_unittest.cc b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader_unittest.cc
index d9db120d6109b8161c50fb23d5f8fda6c0c6f7f4..c8fb8b20531e78172b3cf677a23e37b3a41f6b7d 100644
--- a/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader_unittest.cc
+++ b/chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader_unittest.cc
@@ -4,12 +4,16 @@
 
 #include "chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/numerics/safe_math.h"
@@ -44,16 +48,16 @@ class EventLogger {
   virtual ~EventLogger() {}
 
   void OnRead(int result) { results_.push_back(result); }
-  void OnGetLength(int64 result) { results_.push_back(result); }
+  void OnGetLength(int64_t result) { results_.push_back(result); }
 
   base::WeakPtr<EventLogger> GetWeakPtr() {
     return weak_ptr_factory_.GetWeakPtr();
   }
 
-  const std::vector<int64>& results() const { return results_; }
+  const std::vector<int64_t>& results() const { return results_; }
 
  private:
-  std::vector<int64> results_;
+  std::vector<int64_t> results_;
   base::WeakPtrFactory<EventLogger> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(EventLogger);
@@ -124,7 +128,7 @@ class FileSystemProviderFileStreamReader : public testing::Test {
 TEST_F(FileSystemProviderFileStreamReader, Read_AllAtOnce) {
   EventLogger logger;
 
-  const int64 initial_offset = 0;
+  const int64_t initial_offset = 0;
   FileStreamReader reader(NULL, file_url_, initial_offset,
                           *fake_file_->metadata->modification_time);
   scoped_refptr<net::IOBuffer> io_buffer(new net::IOBuffer(
@@ -147,7 +151,7 @@ TEST_F(FileSystemProviderFileStreamReader, Read_AllAtOnce) {
 TEST_F(FileSystemProviderFileStreamReader, Read_WrongFile) {
   EventLogger logger;
 
-  const int64 initial_offset = 0;
+  const int64_t initial_offset = 0;
   FileStreamReader reader(NULL, wrong_file_url_, initial_offset,
                           *fake_file_->metadata->modification_time);
   scoped_refptr<net::IOBuffer> io_buffer(new net::IOBuffer(
@@ -166,11 +170,11 @@ TEST_F(FileSystemProviderFileStreamReader, Read_WrongFile) {
 TEST_F(FileSystemProviderFileStreamReader, Read_InChunks) {
   EventLogger logger;
 
-  const int64 initial_offset = 0;
+  const int64_t initial_offset = 0;
   FileStreamReader reader(NULL, file_url_, initial_offset,
                           *fake_file_->metadata->modification_time);
 
-  for (int64 offset = 0; offset < *fake_file_->metadata->size; ++offset) {
+  for (int64_t offset = 0; offset < *fake_file_->metadata->size; ++offset) {
     scoped_refptr<net::IOBuffer> io_buffer(new net::IOBuffer(1));
     const int result =
         reader.Read(io_buffer.get(),
@@ -178,7 +182,7 @@ TEST_F(FileSystemProviderFileStreamReader, Read_InChunks) {
                     base::Bind(&EventLogger::OnRead, logger.GetWeakPtr()));
     EXPECT_EQ(net::ERR_IO_PENDING, result);
     base::RunLoop().RunUntilIdle();
-    ASSERT_EQ(offset + 1, static_cast<int64>(logger.results().size()));
+    ASSERT_EQ(offset + 1, static_cast<int64_t>(logger.results().size()));
     EXPECT_EQ(1, logger.results()[offset]);
     EXPECT_EQ(fake_file_->contents[offset], io_buffer->data()[0]);
   }
@@ -188,7 +192,7 @@ TEST_F(FileSystemProviderFileStreamReader, Read_Slice) {
   EventLogger logger;
 
   // Trim first 3 and last 3 characters.
-  const int64 initial_offset = 3;
+  const int64_t initial_offset = 3;
   const int length = *fake_file_->metadata->size - initial_offset - 3;
   ASSERT_GT(*fake_file_->metadata->size, initial_offset);
   ASSERT_LT(0, length);
@@ -217,7 +221,7 @@ TEST_F(FileSystemProviderFileStreamReader, Read_Beyond) {
   EventLogger logger;
 
   // Request reading 1KB more than available.
-  const int64 initial_offset = 0;
+  const int64_t initial_offset = 0;
   const int length = *fake_file_->metadata->size + 1024;
 
   FileStreamReader reader(NULL, file_url_, initial_offset,
@@ -242,7 +246,7 @@ TEST_F(FileSystemProviderFileStreamReader, Read_Beyond) {
 TEST_F(FileSystemProviderFileStreamReader, Read_ModifiedFile) {
   EventLogger logger;
 
-  const int64 initial_offset = 0;
+  const int64_t initial_offset = 0;
   FileStreamReader reader(NULL, file_url_, initial_offset, base::Time::Max());
 
   scoped_refptr<net::IOBuffer> io_buffer(new net::IOBuffer(
@@ -261,7 +265,7 @@ TEST_F(FileSystemProviderFileStreamReader, Read_ModifiedFile) {
 TEST_F(FileSystemProviderFileStreamReader, Read_ExpectedModificationTimeNull) {
   EventLogger logger;
 
-  const int64 initial_offset = 0;
+  const int64_t initial_offset = 0;
   FileStreamReader reader(NULL, file_url_, initial_offset, base::Time());
 
   scoped_refptr<net::IOBuffer> io_buffer(new net::IOBuffer(
@@ -283,7 +287,7 @@ TEST_F(FileSystemProviderFileStreamReader, Read_ExpectedModificationTimeNull) {
 TEST_F(FileSystemProviderFileStreamReader, GetLength) {
   EventLogger logger;
 
-  const int64 initial_offset = 0;
+  const int64_t initial_offset = 0;
   FileStreamReader reader(NULL, file_url_, initial_offset,
                           *fake_file_->metadata->modification_time);
 
@@ -300,7 +304,7 @@ TEST_F(FileSystemProviderFileStreamReader, GetLength) {
 TEST_F(FileSystemProviderFileStreamReader, GetLength_WrongFile) {
   EventLogger logger;
 
-  const int64 initial_offset = 0;
+  const int64_t initial_offset = 0;
   FileStreamReader reader(NULL, wrong_file_url_, initial_offset,
                           *fake_file_->metadata->modification_time);
 
@@ -316,7 +320,7 @@ TEST_F(FileSystemProviderFileStreamReader, GetLength_WrongFile) {
 TEST_F(FileSystemProviderFileStreamReader, GetLength_ModifiedFile) {
   EventLogger logger;
 
-  const int64 initial_offset = 0;
+  const int64_t initial_offset = 0;
   FileStreamReader reader(NULL, file_url_, initial_offset, base::Time::Max());
 
   const int result = reader.GetLength(
@@ -332,7 +336,7 @@ TEST_F(FileSystemProviderFileStreamReader,
        GetLength_ExpectedModificationTimeNull) {
   EventLogger logger;
 
-  const int64 initial_offset = 0;
+  const int64_t initial_offset = 0;
   FileStreamReader reader(NULL, file_url_, initial_offset, base::Time());
 
   const int result = reader.GetLength(