| Index: remoting/host/host_mock_objects.h
|
| diff --git a/remoting/host/host_mock_objects.h b/remoting/host/host_mock_objects.h
|
| index d5ebcdb952c5ffee1f2ecbd6a94013f14de46afe..8dbf7097b902df24adf1c1bc161c19038e262b4f 100644
|
| --- a/remoting/host/host_mock_objects.h
|
| +++ b/remoting/host/host_mock_objects.h
|
| @@ -21,29 +21,16 @@
|
|
|
| namespace remoting {
|
|
|
| -class MockCaptureCompletedCallback {
|
| - public:
|
| - MockCaptureCompletedCallback();
|
| - virtual ~MockCaptureCompletedCallback();
|
| -
|
| - MOCK_METHOD1(CaptureCompletedPtr, void(CaptureData* capture_data));
|
| - void CaptureCompleted(scoped_refptr<CaptureData> capture_data);
|
| -
|
| - private:
|
| - DISALLOW_COPY_AND_ASSIGN(MockCaptureCompletedCallback);
|
| -};
|
| -
|
| class MockVideoFrameCapturer : public VideoFrameCapturer {
|
| public:
|
| MockVideoFrameCapturer();
|
| virtual ~MockVideoFrameCapturer();
|
|
|
| - MOCK_METHOD1(Start, void(const CursorShapeChangedCallback& callback));
|
| + MOCK_METHOD1(Start, void(Delegate* delegate));
|
| MOCK_METHOD0(Stop, void());
|
| MOCK_CONST_METHOD0(pixel_format, media::VideoFrame::Format());
|
| MOCK_METHOD1(InvalidateRegion, void(const SkRegion& invalid_region));
|
| - MOCK_METHOD1(CaptureInvalidRegion,
|
| - void(const CaptureCompletedCallback& callback));
|
| + MOCK_METHOD0(CaptureInvalidRegion, void());
|
| MOCK_CONST_METHOD0(size_most_recent, const SkISize&());
|
|
|
| private:
|
|
|