Switch to standard integer types in content/browser/.

content/browser/fileapi/file_system_file_stream_reader_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "content/public/test/test_file_system_context.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "storage/browser/fileapi/external_mount_points.h"
 #include "storage/browser/fileapi/file_system_context.h"
 #include "storage/browser/fileapi/file_system_file_util.h"
@@ skipping 61 matching lines @@
 
     WriteFile(kTestFileName, kTestData, kTestDataSize,
               &test_file_modification_time_);
   }
 
   void TearDown() override { base::RunLoop().RunUntilIdle(); }
 
  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),
                                           initial_offset,
                                           expected_modification_time);
   }
 
   base::Time test_file_modification_time() const {
     return test_file_modification_time_;
   }
@@ skipping 53 matching lines @@
 
   scoped_ptr<FileSystemFileStreamReader> reader(
       CreateFileReader(kFileName, 0, base::Time()));
   int result = 0;
   std::string data;
   ReadFromReader(reader.get(), &data, 10, &result);
   ASSERT_EQ(net::OK, result);
   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);
 }
 
 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);
 }
 
 TEST_F(FileSystemFileStreamReaderTest, GetLengthAfterModified) {
   // Pass a fake expected modifictaion time so that the expectation fails.
   base::Time fake_expected_modification_time =
       test_file_modification_time() - base::TimeDelta::FromSeconds(10);
 
   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);
 
   // With NULL expected modification time this should work.
   reader.reset(CreateFileReader(kTestFileName, 0, base::Time()));
   result = reader->GetLength(callback.callback());
   if (result == net::ERR_IO_PENDING)
     result = callback.WaitForResult();
   ASSERT_EQ(kTestDataSize, result);
 }
 
 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.
   ASSERT_EQ(kTestDataSize, result);
 }
 
 TEST_F(FileSystemFileStreamReaderTest, ReadNormal) {
   scoped_ptr<FileSystemFileStreamReader> reader(
       CreateFileReader(kTestFileName, 0, test_file_modification_time()));
   int result = 0;
@@ skipping 43 matching lines @@
       new net::IOBufferWithSize(kTestDataSize));
   int rv = reader->Read(buf.get(), buf->size(), base::Bind(&NeverCalled));
   ASSERT_TRUE(rv == net::ERR_IO_PENDING || rv >= 0);
 
   // Delete immediately.
   // Should not crash; nor should NeverCalled be callback.
   reader.reset();
 }
 
 }  // namespace content