Switch to standard integer types in content/browser/.

content/browser/fileapi/file_system_file_stream_reader_unittest.cc

Index: content/browser/fileapi/file_system_file_stream_reader_unittest.cc
diff --git a/content/browser/fileapi/file_system_file_stream_reader_unittest.cc b/content/browser/fileapi/file_system_file_stream_reader_unittest.cc
index 5e13f15c28800526c156f3ce52ec7e4e6b4be35c..acb36500edb867dc99581b8673e8ffa44188ffe9 100644
--- a/content/browser/fileapi/file_system_file_stream_reader_unittest.cc
+++ b/content/browser/fileapi/file_system_file_stream_reader_unittest.cc
@@ -4,10 +4,14 @@
 
 #include "storage/browser/fileapi/file_system_file_stream_reader.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <limits>
 #include <string>
 
 #include "base/files/scoped_temp_dir.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "content/public/test/async_file_test_helper.h"
@@ -89,7 +93,7 @@ class FileSystemFileStreamReaderTest : public testing::Test {
  protected:
   storage::FileSystemFileStreamReader* CreateFileReader(
       const std::string& file_name,
-      int64 initial_offset,
+      int64_t initial_offset,
       const base::Time& expected_modification_time) {
     return new FileSystemFileStreamReader(file_system_context_.get(),
                                           GetFileSystemURL(file_name),
@@ -163,7 +167,7 @@ TEST_F(FileSystemFileStreamReaderTest, Empty) {
   ASSERT_EQ(0U, data.size());
 
   net::TestInt64CompletionCallback callback;
-  int64 length_result = reader->GetLength(callback.callback());
+  int64_t length_result = reader->GetLength(callback.callback());
   if (length_result == net::ERR_IO_PENDING)
     length_result = callback.WaitForResult();
   ASSERT_EQ(0, length_result);
@@ -173,7 +177,7 @@ TEST_F(FileSystemFileStreamReaderTest, GetLengthNormal) {
   scoped_ptr<FileSystemFileStreamReader> reader(
       CreateFileReader(kTestFileName, 0, test_file_modification_time()));
   net::TestInt64CompletionCallback callback;
-  int64 result = reader->GetLength(callback.callback());
+  int64_t result = reader->GetLength(callback.callback());
   if (result == net::ERR_IO_PENDING)
     result = callback.WaitForResult();
   ASSERT_EQ(kTestDataSize, result);
@@ -187,7 +191,7 @@ TEST_F(FileSystemFileStreamReaderTest, GetLengthAfterModified) {
   scoped_ptr<FileSystemFileStreamReader> reader(
       CreateFileReader(kTestFileName, 0, fake_expected_modification_time));
   net::TestInt64CompletionCallback callback;
-  int64 result = reader->GetLength(callback.callback());
+  int64_t result = reader->GetLength(callback.callback());
   if (result == net::ERR_IO_PENDING)
     result = callback.WaitForResult();
   ASSERT_EQ(net::ERR_UPLOAD_FILE_CHANGED, result);
@@ -204,7 +208,7 @@ TEST_F(FileSystemFileStreamReaderTest, GetLengthWithOffset) {
   scoped_ptr<FileSystemFileStreamReader> reader(
       CreateFileReader(kTestFileName, 3, base::Time()));
   net::TestInt64CompletionCallback callback;
-  int64 result = reader->GetLength(callback.callback());
+  int64_t result = reader->GetLength(callback.callback());
   if (result == net::ERR_IO_PENDING)
     result = callback.WaitForResult();
   // Initial offset does not affect the result of GetLength.