Switch to standard integer types in media/.

media/blink/buffered_data_source_unittest.cc

Index: media/blink/buffered_data_source_unittest.cc
diff --git a/media/blink/buffered_data_source_unittest.cc b/media/blink/buffered_data_source_unittest.cc
index 4ac4f935edc17f79efc731ce0622098b4bd6cf03..719ed2c4651cf0fe97e2cb63485ba1b74841e166 100644
--- a/media/blink/buffered_data_source_unittest.cc
+++ b/media/blink/buffered_data_source_unittest.cc
@@ -38,8 +38,8 @@ class MockBufferedDataSourceHost : public BufferedDataSourceHost {
   MockBufferedDataSourceHost() {}
   virtual ~MockBufferedDataSourceHost() {}
 
-  MOCK_METHOD1(SetTotalBytes, void(int64 total_bytes));
-  MOCK_METHOD2(AddBufferedByteRange, void(int64 start, int64 end));
+  MOCK_METHOD1(SetTotalBytes, void(int64_t total_bytes));
+  MOCK_METHOD2(AddBufferedByteRange, void(int64_t start, int64_t end));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockBufferedDataSourceHost);
@@ -67,9 +67,9 @@ class MockBufferedDataSource : public BufferedDataSource {
         loading_(false) {}
   virtual ~MockBufferedDataSource() {}
 
-  MOCK_METHOD2(CreateResourceLoader, BufferedResourceLoader*(int64, int64));
-  BufferedResourceLoader* CreateMockResourceLoader(int64 first_byte_position,
-                                                   int64 last_byte_position) {
+  MOCK_METHOD2(CreateResourceLoader, BufferedResourceLoader*(int64_t, int64_t));
+  BufferedResourceLoader* CreateMockResourceLoader(int64_t first_byte_position,
+                                                   int64_t last_byte_position) {
     CHECK(!loading_) << "Previous resource load wasn't cancelled";
 
     BufferedResourceLoader* loader =
@@ -103,8 +103,8 @@ class MockBufferedDataSource : public BufferedDataSource {
   DISALLOW_COPY_AND_ASSIGN(MockBufferedDataSource);
 };
 
-static const int64 kFileSize = 5000000;
-static const int64 kFarReadPosition = 4000000;
+static const int64_t kFileSize = 5000000;
+static const int64_t kFarReadPosition = 4000000;
 static const int kDataSize = 1024;
 
 static const char kHttpUrl[] = "http://localhost/foo.webm";
@@ -224,7 +224,7 @@ class BufferedDataSourceTest : public testing::Test {
 
   MOCK_METHOD1(ReadCallback, void(int size));
 
-  void ReadAt(int64 position) {
+  void ReadAt(int64_t position) {
     data_source_->Read(position, kDataSize, buffer_,
                        base::Bind(&BufferedDataSourceTest::ReadCallback,
                                   base::Unretained(this)));
@@ -307,7 +307,7 @@ class BufferedDataSourceTest : public testing::Test {
 
  private:
   // Used for calling BufferedDataSource::Read().
-  uint8 buffer_[kDataSize];
+  uint8_t buffer_[kDataSize];
 
   BufferedDataSource::Preload preload_;
 
@@ -699,7 +699,7 @@ TEST_F(BufferedDataSourceTest, File_Successful) {
 TEST_F(BufferedDataSourceTest, StopDuringRead) {
   InitializeWith206Response();
 
-  uint8 buffer[256];
+  uint8_t buffer[256];
   data_source_->Read(0, arraysize(buffer), buffer, base::Bind(
       &BufferedDataSourceTest::ReadCallback, base::Unretained(this)));