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

Side by Side Diff: media/filters/decrypting_demuxer_stream_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 <string> 5 #include <string>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/callback_helpers.h" 9 #include "base/callback_helpers.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
11 #include "media/base/decoder_buffer.h" 11 #include "media/base/decoder_buffer.h"
12 #include "media/base/decrypt_config.h" 12 #include "media/base/decrypt_config.h"
13 #include "media/base/gmock_callback_support.h" 13 #include "media/base/gmock_callback_support.h"
14 #include "media/base/mock_callback.h"
15 #include "media/base/mock_filters.h" 14 #include "media/base/mock_filters.h"
15 #include "media/base/test_helpers.h"
16 #include "media/filters/decrypting_demuxer_stream.h" 16 #include "media/filters/decrypting_demuxer_stream.h"
17 #include "testing/gmock/include/gmock/gmock.h" 17 #include "testing/gmock/include/gmock/gmock.h"
18 18
19 using ::testing::_; 19 using ::testing::_;
20 using ::testing::IsNull; 20 using ::testing::IsNull;
21 using ::testing::Return; 21 using ::testing::Return;
22 using ::testing::ReturnRef; 22 using ::testing::ReturnRef;
23 using ::testing::SaveArg; 23 using ::testing::SaveArg;
24 using ::testing::StrictMock; 24 using ::testing::StrictMock;
25 25
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 448
449 EXPECT_CALL(*input_audio_stream_, Read(_)) 449 EXPECT_CALL(*input_audio_stream_, Read(_))
450 .WillOnce(RunCallback<0>(DemuxerStream::kConfigChanged, 450 .WillOnce(RunCallback<0>(DemuxerStream::kConfigChanged,
451 scoped_refptr<DecoderBuffer>())); 451 scoped_refptr<DecoderBuffer>()));
452 452
453 // TODO(xhwang): Update this when kConfigChanged is supported. 453 // TODO(xhwang): Update this when kConfigChanged is supported.
454 ReadAndExpectBufferReadyWith(DemuxerStream::kAborted, NULL); 454 ReadAndExpectBufferReadyWith(DemuxerStream::kAborted, NULL);
455 } 455 }
456 456
457 } // namespace media 457 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/decrypting_audio_decoder_unittest.cc ('k') | media/filters/decrypting_video_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698