| Index: media/base/mock_filters.cc
|
| diff --git a/media/base/mock_filters.cc b/media/base/mock_filters.cc
|
| index 19ace24e3953090427e6cd63f0bc1111decc7c61..1292c8d1c24c5ea15fcff5def4341f5d873a37d2 100644
|
| --- a/media/base/mock_filters.cc
|
| +++ b/media/base/mock_filters.cc
|
| @@ -7,9 +7,12 @@
|
| #include "base/logging.h"
|
|
|
| using ::testing::_;
|
| -using ::testing::Invoke;
|
| -using ::testing::NotNull;
|
| using ::testing::Return;
|
| +using ::testing::SaveArg;
|
| +
|
| +MATCHER(NotEmpty, "") {
|
| + return !arg.empty();
|
| +}
|
|
|
| namespace media {
|
|
|
| @@ -146,6 +149,37 @@ void MockCdmContext::set_cdm_id(int cdm_id) {
|
| cdm_id_ = cdm_id;
|
| }
|
|
|
| +MockCdmPromise::MockCdmPromise(bool expect_success) {
|
| + if (expect_success) {
|
| + EXPECT_CALL(*this, resolve());
|
| + EXPECT_CALL(*this, reject(_, _, _)).Times(0);
|
| + } else {
|
| + EXPECT_CALL(*this, resolve()).Times(0);
|
| + EXPECT_CALL(*this, reject(_, _, NotEmpty()));
|
| + }
|
| +}
|
| +
|
| +MockCdmPromise::~MockCdmPromise() {
|
| + // The EXPECT calls will verify that the promise is in fact fulfilled.
|
| + MarkPromiseSettled();
|
| +}
|
| +
|
| +MockCdmSessionPromise::MockCdmSessionPromise(bool expect_success,
|
| + std::string* new_session_id) {
|
| + if (expect_success) {
|
| + EXPECT_CALL(*this, resolve(_)).WillOnce(SaveArg<0>(new_session_id));
|
| + EXPECT_CALL(*this, reject(_, _, _)).Times(0);
|
| + } else {
|
| + EXPECT_CALL(*this, resolve(_)).Times(0);
|
| + EXPECT_CALL(*this, reject(_, _, NotEmpty()));
|
| + }
|
| +}
|
| +
|
| +MockCdmSessionPromise::~MockCdmSessionPromise() {
|
| + // The EXPECT calls will verify that the promise is in fact fulfilled.
|
| + MarkPromiseSettled();
|
| +}
|
| +
|
| MockStreamParser::MockStreamParser() {}
|
|
|
| MockStreamParser::~MockStreamParser() {}
|
|
|