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

Unified Diff: media/audio/cras/cras_unified_unittest.cc

Issue 1534273002: Switch to standard integer types in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more Created 5 years 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
Index: media/audio/cras/cras_unified_unittest.cc
diff --git a/media/audio/cras/cras_unified_unittest.cc b/media/audio/cras/cras_unified_unittest.cc
index 64014c63fb0486868092e4f241d270bfc1e99940..8062688b466912599099d67a0e6eade51804d059 100644
--- a/media/audio/cras/cras_unified_unittest.cc
+++ b/media/audio/cras/cras_unified_unittest.cc
@@ -72,7 +72,7 @@ class CrasUnifiedStreamTest : public testing::Test {
}
CrasUnifiedStream* CreateStream(ChannelLayout layout,
- int32 samples_per_packet) {
+ int32_t samples_per_packet) {
AudioParameters params(kTestFormat, layout, kTestSampleRate,
kTestBitsPerSample, samples_per_packet);
return new CrasUnifiedStream(params, mock_manager_.get());
@@ -86,7 +86,7 @@ class CrasUnifiedStreamTest : public testing::Test {
static const int kTestSampleRate;
static const int kTestBitsPerSample;
static const AudioParameters::Format kTestFormat;
- static const uint32 kTestFramesPerPacket;
+ static const uint32_t kTestFramesPerPacket;
scoped_ptr<StrictMock<MockAudioManagerCras> > mock_manager_;
@@ -101,7 +101,7 @@ const int CrasUnifiedStreamTest::kTestSampleRate =
const int CrasUnifiedStreamTest::kTestBitsPerSample = 16;
const AudioParameters::Format CrasUnifiedStreamTest::kTestFormat =
AudioParameters::AUDIO_PCM_LINEAR;
-const uint32 CrasUnifiedStreamTest::kTestFramesPerPacket = 1000;
+const uint32_t CrasUnifiedStreamTest::kTestFramesPerPacket = 1000;
TEST_F(CrasUnifiedStreamTest, ConstructedState) {
CrasUnifiedStream* test_stream = CreateStream(kTestChannelLayout);

Powered by Google App Engine
This is Rietveld 408576698