Switch to standard integer types in content/browser/.

content/browser/fileapi/local_file_stream_reader_unittest.cc

 // Copyright 2014 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/local_file_stream_reader.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <string>
 
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/location.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using storage::LocalFileStreamReader;
@@ skipping 55 matching lines @@
   void TearDown() override {
     // Give another chance for deleted streams to perform Close.
     base::RunLoop().RunUntilIdle();
     file_thread_.Stop();
     base::RunLoop().RunUntilIdle();
   }
 
  protected:
   LocalFileStreamReader* CreateFileReader(
       const base::FilePath& path,
-      int64 initial_offset,
+      int64_t initial_offset,
       const base::Time& expected_modification_time) {
     return new LocalFileStreamReader(
             file_task_runner(),
             path,
             initial_offset,
             expected_modification_time);
   }
 
   void TouchTestFile(base::TimeDelta delta) {
     base::Time new_modified_time = test_file_modification_time() + delta;
@@ skipping 44 matching lines @@
 
   scoped_ptr<LocalFileStreamReader> reader(
       CreateFileReader(empty_path, 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, result);
 }
 
 TEST_F(LocalFileStreamReaderTest, GetLengthNormal) {
   scoped_ptr<LocalFileStreamReader> reader(
       CreateFileReader(test_path(), 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(LocalFileStreamReaderTest, GetLengthAfterModified) {
   // Touch file so that the file's modification time becomes different
   // from what we expect.
   TouchTestFile(base::TimeDelta::FromSeconds(-1));
 
   scoped_ptr<LocalFileStreamReader> reader(
       CreateFileReader(test_path(), 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(net::ERR_UPLOAD_FILE_CHANGED, result);
 
   // With NULL expected modification time this should work.
   reader.reset(CreateFileReader(test_path(), 0, base::Time()));
   result = reader->GetLength(callback.callback());
   if (result == net::ERR_IO_PENDING)
     result = callback.WaitForResult();
   ASSERT_EQ(kTestDataSize, result);
 }
 
 TEST_F(LocalFileStreamReaderTest, GetLengthWithOffset) {
   scoped_ptr<LocalFileStreamReader> reader(
       CreateFileReader(test_path(), 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(LocalFileStreamReaderTest, ReadNormal) {
   scoped_ptr<LocalFileStreamReader> reader(
       CreateFileReader(test_path(), 0, test_file_modification_time()));
   int result = 0;
   std::string data;
   ReadFromReader(reader.get(), &data, kTestDataSize, &result);
   ASSERT_EQ(net::OK, result);
   ASSERT_EQ(kTestData, data);
 }
 
 TEST_F(LocalFileStreamReaderTest, ReadAfterModified) {
   // Touch file so that the file's modification time becomes different
   // from what we expect. Note that the resolution on some filesystems
   // is 1s so we can't test with deltas less than that.
   TouchTestFile(base::TimeDelta::FromSeconds(-1));
   scoped_ptr<LocalFileStreamReader> reader(
       CreateFileReader(test_path(), 0, test_file_modification_time()));
   int result = 0;
   std::string data;
   ReadFromReader(reader.get(), &data, kTestDataSize, &result);
   EXPECT_EQ(net::ERR_UPLOAD_FILE_CHANGED, result);
   EXPECT_EQ(0U, data.size());
 
-  // Due to precision loss converting int64->double->int64 (e.g. through
+  // Due to precision loss converting int64_t->double->int64_t (e.g. through
   // Blink) the expected/actual time may vary by microseconds. With
   // modification time delta < 10us this should work.
   TouchTestFile(base::TimeDelta::FromMicroseconds(1));
   data.clear();
   reader.reset(CreateFileReader(test_path(), 0, test_file_modification_time()));
   ReadFromReader(reader.get(), &data, kTestDataSize, &result);
   EXPECT_EQ(net::OK, result);
   EXPECT_EQ(kTestData, data);
 
   // With matching modification times time this should work.
@@ skipping 32 matching lines @@
   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();
   EnsureFileTaskFinished();
 }
 
 }  // namespace content