| Index: media/base/mock_callback.cc
|
| diff --git a/media/base/mock_callback.cc b/media/base/mock_callback.cc
|
| index 03ed8967ab3eb41903dbebc10626382f9704c035..eeedd15672d53b133436338418605178a1a44aa2 100644
|
| --- a/media/base/mock_callback.cc
|
| +++ b/media/base/mock_callback.cc
|
| @@ -28,13 +28,13 @@ MockStatusCallback::~MockStatusCallback() {
|
|
|
| // Required by GMock to allow the RunWithParams() expectation
|
| // in ExpectRunAndDelete() to compile.
|
| -bool operator==(const Tuple1<PipelineError>& lhs,
|
| - const Tuple1<PipelineError>& rhs) {
|
| +bool operator==(const Tuple1<PipelineStatus>& lhs,
|
| + const Tuple1<PipelineStatus>& rhs) {
|
| return lhs.a == rhs.a;
|
| }
|
|
|
| -void MockStatusCallback::ExpectRunAndDelete(PipelineError error) {
|
| - EXPECT_CALL(*this, RunWithParams(Tuple1<PipelineError>(error)));
|
| +void MockStatusCallback::ExpectRunAndDelete(PipelineStatus status) {
|
| + EXPECT_CALL(*this, RunWithParams(Tuple1<PipelineStatus>(status)));
|
| EXPECT_CALL(*this, Destructor());
|
| }
|
|
|
| @@ -44,10 +44,10 @@ MockCallback* NewExpectedCallback() {
|
| return callback;
|
| }
|
|
|
| -MockStatusCallback* NewExpectedStatusCallback(PipelineError error) {
|
| +MockStatusCallback* NewExpectedStatusCallback(PipelineStatus status) {
|
| StrictMock<MockStatusCallback>* callback =
|
| new StrictMock<MockStatusCallback>();
|
| - callback->ExpectRunAndDelete(error);
|
| + callback->ExpectRunAndDelete(status);
|
| return callback;
|
| }
|
|
|
|
|