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

Side by Side Diff: media/filters/ffmpeg_audio_decoder_unittest.cc

Issue 11316293: Replace WaitableEvents and ConditionalVariables in VideoRendererBase tests with MessageLoop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bustage Created 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <deque> 5 #include <deque>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/stringprintf.h" 9 #include "base/stringprintf.h"
10 #include "media/base/decoder_buffer.h" 10 #include "media/base/decoder_buffer.h"
11 #include "media/base/mock_callback.h"
12 #include "media/base/mock_filters.h" 11 #include "media/base/mock_filters.h"
13 #include "media/base/test_data_util.h" 12 #include "media/base/test_data_util.h"
13 #include "media/base/test_helpers.h"
14 #include "media/ffmpeg/ffmpeg_common.h" 14 #include "media/ffmpeg/ffmpeg_common.h"
15 #include "media/filters/ffmpeg_audio_decoder.h" 15 #include "media/filters/ffmpeg_audio_decoder.h"
16 #include "media/filters/ffmpeg_glue.h" 16 #include "media/filters/ffmpeg_glue.h"
17 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
18 18
19 using ::testing::_; 19 using ::testing::_;
20 using ::testing::ReturnRef; 20 using ::testing::ReturnRef;
21 using ::testing::StrictMock; 21 using ::testing::StrictMock;
22 22
23 namespace media { 23 namespace media {
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 169
170 EXPECT_CALL(*demuxer_, Read(_)) 170 EXPECT_CALL(*demuxer_, Read(_))
171 .WillOnce(InvokeReadPacket(this)); 171 .WillOnce(InvokeReadPacket(this));
172 Read(); 172 Read();
173 173
174 EXPECT_EQ(decoded_audio_.size(), 1u); 174 EXPECT_EQ(decoded_audio_.size(), 1u);
175 EXPECT_TRUE(decoded_audio_[0].get() == NULL); 175 EXPECT_TRUE(decoded_audio_[0].get() == NULL);
176 } 176 }
177 177
178 } // namespace media 178 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/decrypting_video_decoder_unittest.cc ('k') | media/filters/ffmpeg_demuxer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698