| Index: media/filters/blocking_url_protocol_unittest.cc
|
| diff --git a/media/filters/blocking_url_protocol_unittest.cc b/media/filters/blocking_url_protocol_unittest.cc
|
| index ec55a007465e46ff808e3cca2b4ab4d15a85bbaf..aed79c4321b4791414df4eac47bd92c35e8cdf5d 100644
|
| --- a/media/filters/blocking_url_protocol_unittest.cc
|
| +++ b/media/filters/blocking_url_protocol_unittest.cc
|
| @@ -39,13 +39,13 @@ class BlockingUrlProtocolTest : public testing::Test {
|
|
|
| TEST_F(BlockingUrlProtocolTest, Read) {
|
| // Set read head to zero as Initialize() will have parsed a bit of the file.
|
| - int64 position = 0;
|
| + int64_t position = 0;
|
| EXPECT_TRUE(url_protocol_.SetPosition(0));
|
| EXPECT_TRUE(url_protocol_.GetPosition(&position));
|
| EXPECT_EQ(0, position);
|
|
|
| // Read 32 bytes from offset zero and verify position.
|
| - uint8 buffer[32];
|
| + uint8_t buffer[32];
|
| EXPECT_EQ(32, url_protocol_.Read(32, buffer));
|
| EXPECT_TRUE(url_protocol_.GetPosition(&position));
|
| EXPECT_EQ(32, position);
|
| @@ -56,7 +56,7 @@ TEST_F(BlockingUrlProtocolTest, Read) {
|
| EXPECT_EQ(64, position);
|
|
|
| // Seek to end and read until EOF.
|
| - int64 size = 0;
|
| + int64_t size = 0;
|
| EXPECT_TRUE(url_protocol_.GetSize(&size));
|
| EXPECT_TRUE(url_protocol_.SetPosition(size - 48));
|
| EXPECT_EQ(32, url_protocol_.Read(32, buffer));
|
| @@ -75,14 +75,14 @@ TEST_F(BlockingUrlProtocolTest, Read) {
|
| TEST_F(BlockingUrlProtocolTest, ReadError) {
|
| data_source_.force_read_errors_for_testing();
|
|
|
| - uint8 buffer[32];
|
| + uint8_t buffer[32];
|
| EXPECT_CALL(*this, OnDataSourceError());
|
| EXPECT_EQ(AVERROR(EIO), url_protocol_.Read(32, buffer));
|
| }
|
|
|
| TEST_F(BlockingUrlProtocolTest, GetSetPosition) {
|
| - int64 size;
|
| - int64 position;
|
| + int64_t size;
|
| + int64_t position;
|
| EXPECT_TRUE(url_protocol_.GetSize(&size));
|
| EXPECT_TRUE(url_protocol_.GetPosition(&position));
|
|
|
| @@ -98,8 +98,8 @@ TEST_F(BlockingUrlProtocolTest, GetSetPosition) {
|
| }
|
|
|
| TEST_F(BlockingUrlProtocolTest, GetSize) {
|
| - int64 data_source_size = 0;
|
| - int64 url_protocol_size = 0;
|
| + int64_t data_source_size = 0;
|
| + int64_t url_protocol_size = 0;
|
| EXPECT_TRUE(data_source_.GetSize(&data_source_size));
|
| EXPECT_TRUE(url_protocol_.GetSize(&url_protocol_size));
|
| EXPECT_NE(0, data_source_size);
|
|
|