Chromium Code Reviews| Index: content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc |
| diff --git a/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc b/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc |
| index e445580dca24a6141256d37d5c019ab40240bc2d..943635fa7baff0e1ba162d4327e5e79985745993 100644 |
| --- a/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc |
| +++ b/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc |
| @@ -26,7 +26,9 @@ static const media::VideoPixelFormat kCaptureFormats[] = { |
| media::PIXEL_FORMAT_I420, |
| media::PIXEL_FORMAT_TEXTURE, |
| #if !defined(OS_ANDROID) |
| - media::PIXEL_FORMAT_GPUMEMORYBUFFER |
| + // TODO(mcasas): Re-enable after removing usage of |
| + // BrowserGpuMemoryBufferManager from unit tests. |
| + // media::PIXEL_FORMAT_GPUMEMORYBUFFER |
|
reveman
2015/06/17 18:28:01
I had to disable this as BrowserGpuMemoryBufferMan
|
| #endif |
| }; |
| @@ -77,8 +79,7 @@ class VideoCaptureBufferPoolTest |
| class StubBrowserGpuMemoryBufferManager |
| : public BrowserGpuMemoryBufferManager { |
| public: |
| - StubBrowserGpuMemoryBufferManager() |
| - : BrowserGpuMemoryBufferManager(nullptr, 1) {} |
| + StubBrowserGpuMemoryBufferManager() {} |
| scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer( |
| const gfx::Size& size, |