Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(766)

Unified Diff: media/audio/linux/alsa_output_unittest.cc

Issue 9854031: Replace size_t with int in a few media classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/audio/linux/alsa_output.cc ('k') | media/audio/mac/audio_low_latency_input_mac_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/linux/alsa_output_unittest.cc
diff --git a/media/audio/linux/alsa_output_unittest.cc b/media/audio/linux/alsa_output_unittest.cc
index adc06e40e561736184215bb736efca3d0a3d61ba..ab9a654eda6ac93764f799b97cb1ae50012426ba 100644
--- a/media/audio/linux/alsa_output_unittest.cc
+++ b/media/audio/linux/alsa_output_unittest.cc
@@ -160,7 +160,7 @@ class AlsaPcmOutputStreamTest : public testing::Test {
static const char kTestDeviceName[];
static const char kDummyMessage[];
static const uint32 kTestFramesPerPacket;
- static const uint32 kTestPacketSize;
+ static const int kTestPacketSize;
static const int kTestFailedErrno;
static snd_pcm_t* const kFakeHandle;
@@ -195,7 +195,7 @@ const AudioParameters::Format AlsaPcmOutputStreamTest::kTestFormat =
const char AlsaPcmOutputStreamTest::kTestDeviceName[] = "TestDevice";
const char AlsaPcmOutputStreamTest::kDummyMessage[] = "dummy";
const uint32 AlsaPcmOutputStreamTest::kTestFramesPerPacket = 1000;
-const uint32 AlsaPcmOutputStreamTest::kTestPacketSize =
+const int AlsaPcmOutputStreamTest::kTestPacketSize =
AlsaPcmOutputStreamTest::kTestFramesPerPacket *
AlsaPcmOutputStreamTest::kTestBytesPerFrame;
const int AlsaPcmOutputStreamTest::kTestFailedErrno = -EACCES;
@@ -498,7 +498,7 @@ TEST_F(AlsaPcmOutputStreamTest, WritePacket_NormalPacket) {
_))
.WillOnce(Return(packet_->GetDataSize() / kTestBytesPerFrame - written));
test_stream->WritePacket();
- EXPECT_EQ(0u, test_stream->buffer_->forward_bytes());
+ EXPECT_EQ(0, test_stream->buffer_->forward_bytes());
test_stream->Close();
}
@@ -539,7 +539,7 @@ TEST_F(AlsaPcmOutputStreamTest, WritePacket_StopStream) {
// No expectations set on the strict mock because nothing should be called.
test_stream->stop_stream_ = true;
test_stream->WritePacket();
- EXPECT_EQ(0u, test_stream->buffer_->forward_bytes());
+ EXPECT_EQ(0, test_stream->buffer_->forward_bytes());
test_stream->Close();
}
@@ -566,7 +566,7 @@ TEST_F(AlsaPcmOutputStreamTest, BufferPacket) {
test_stream->packet_size_ = kTestPacketSize;
test_stream->BufferPacket(&source_exhausted);
- EXPECT_EQ(10u, test_stream->buffer_->forward_bytes());
+ EXPECT_EQ(10, test_stream->buffer_->forward_bytes());
EXPECT_FALSE(source_exhausted);
test_stream->Close();
}
@@ -592,7 +592,7 @@ TEST_F(AlsaPcmOutputStreamTest, BufferPacket_Negative) {
test_stream->packet_size_ = kTestPacketSize;
test_stream->BufferPacket(&source_exhausted);
- EXPECT_EQ(10u, test_stream->buffer_->forward_bytes());
+ EXPECT_EQ(10, test_stream->buffer_->forward_bytes());
EXPECT_FALSE(source_exhausted);
test_stream->Close();
}
@@ -619,7 +619,7 @@ TEST_F(AlsaPcmOutputStreamTest, BufferPacket_Underrun) {
test_stream->packet_size_ = kTestPacketSize;
test_stream->BufferPacket(&source_exhausted);
- EXPECT_EQ(10u, test_stream->buffer_->forward_bytes());
+ EXPECT_EQ(10, test_stream->buffer_->forward_bytes());
EXPECT_FALSE(source_exhausted);
test_stream->Close();
}
@@ -777,7 +777,7 @@ TEST_F(AlsaPcmOutputStreamTest, BufferPacket_StopStream) {
test_stream->stop_stream_ = true;
bool source_exhausted;
test_stream->BufferPacket(&source_exhausted);
- EXPECT_EQ(0u, test_stream->buffer_->forward_bytes());
+ EXPECT_EQ(0, test_stream->buffer_->forward_bytes());
EXPECT_TRUE(source_exhausted);
test_stream->Close();
}
« no previous file with comments | « media/audio/linux/alsa_output.cc ('k') | media/audio/mac/audio_low_latency_input_mac_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698