| Index: content/browser/renderer_host/media/video_capture_host_unittest.cc
|
| diff --git a/content/browser/renderer_host/media/video_capture_host_unittest.cc b/content/browser/renderer_host/media/video_capture_host_unittest.cc
|
| index 635b1bd0b5dfbbde68bc25a702e46fffc0167243..56b061d2d4a90370aa8ef4b7390051510e3d094b 100644
|
| --- a/content/browser/renderer_host/media/video_capture_host_unittest.cc
|
| +++ b/content/browser/renderer_host/media/video_capture_host_unittest.cc
|
| @@ -76,10 +76,6 @@ class MockVideoCaptureHost : public VideoCaptureHost {
|
| : VideoCaptureHost(resource_context, audio_manager),
|
| return_buffers_(false),
|
| dump_video_(false) {}
|
| - virtual ~MockVideoCaptureHost() {
|
| - STLDeleteContainerPairSecondPointers(filled_dib_.begin(),
|
| - filled_dib_.end());
|
| - }
|
|
|
| // A list of mock methods.
|
| MOCK_METHOD4(OnNewBufferCreated,
|
| @@ -95,6 +91,7 @@ class MockVideoCaptureHost : public VideoCaptureHost {
|
| void SetDumpVideo(bool enable) {
|
| dump_video_ = enable;
|
| }
|
| +
|
| void SetReturnReceviedDibs(bool enable) {
|
| return_buffers_ = enable;
|
| }
|
| @@ -107,6 +104,7 @@ class MockVideoCaptureHost : public VideoCaptureHost {
|
| handle = GetReceivedDib();
|
| }
|
| }
|
| +
|
| int GetReceivedDib() {
|
| if (filled_dib_.empty())
|
| return 0;
|
| @@ -119,6 +117,11 @@ class MockVideoCaptureHost : public VideoCaptureHost {
|
| }
|
|
|
| private:
|
| + virtual ~MockVideoCaptureHost() {
|
| + STLDeleteContainerPairSecondPointers(filled_dib_.begin(),
|
| + filled_dib_.end());
|
| + }
|
| +
|
| // This method is used to dispatch IPC messages to the renderer. We intercept
|
| // these messages here and dispatch to our mock methods to verify the
|
| // conversation between this object and the renderer.
|
|
|