| OLD | NEW |
| 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/base/video_frame.h" | 16 #include "media/base/video_frame.h" |
| 17 #include "media/filters/decrypting_video_decoder.h" | 17 #include "media/filters/decrypting_video_decoder.h" |
| 18 #include "testing/gmock/include/gmock/gmock.h" | 18 #include "testing/gmock/include/gmock/gmock.h" |
| 19 | 19 |
| 20 using ::testing::_; | 20 using ::testing::_; |
| 21 using ::testing::AtMost; | 21 using ::testing::AtMost; |
| 22 using ::testing::IsNull; | 22 using ::testing::IsNull; |
| 23 using ::testing::ReturnRef; | 23 using ::testing::ReturnRef; |
| 24 using ::testing::SaveArg; | 24 using ::testing::SaveArg; |
| 25 using ::testing::StrictMock; | 25 using ::testing::StrictMock; |
| (...skipping 572 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 598 EXPECT_CALL(*demuxer_, Read(_)) | 598 EXPECT_CALL(*demuxer_, Read(_)) |
| 599 .WillOnce(RunCallback<0>(DemuxerStream::kConfigChanged, | 599 .WillOnce(RunCallback<0>(DemuxerStream::kConfigChanged, |
| 600 scoped_refptr<DecoderBuffer>())); | 600 scoped_refptr<DecoderBuffer>())); |
| 601 | 601 |
| 602 // TODO(xhwang): Update this test when kConfigChanged is supported in | 602 // TODO(xhwang): Update this test when kConfigChanged is supported in |
| 603 // DecryptingVideoDecoder. | 603 // DecryptingVideoDecoder. |
| 604 ReadAndExpectFrameReadyWith(VideoDecoder::kDecodeError, null_video_frame_); | 604 ReadAndExpectFrameReadyWith(VideoDecoder::kDecodeError, null_video_frame_); |
| 605 } | 605 } |
| 606 | 606 |
| 607 } // namespace media | 607 } // namespace media |
| OLD | NEW |