Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1016)

Unified Diff: content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc

Issue 1922783004: Remove MockBufferQueue from VideoCaptureBufferPoolTest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 28c00339396e69fbac61ce96236a5f21ccb29fe1..bd94c90eff6a3cb456c3c68f9e65596195fecedf 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
@@ -113,21 +113,6 @@ class VideoCaptureBufferPoolTest
return base::WrapUnique(new MockGpuMemoryBuffer(size));
}
};
- class MockBufferQueue : public display_compositor::BufferQueue {
- public:
- MockBufferQueue(scoped_refptr<cc::ContextProvider> context_provider,
- BrowserGpuMemoryBufferManager* gpu_memory_buffer_manager,
- unsigned int target,
- unsigned int internalformat)
- : BufferQueue(context_provider,
- target,
- internalformat,
- nullptr,
- gpu_memory_buffer_manager,
- 1) {}
- MOCK_METHOD4(CopyBufferDamage,
- void(int, int, const gfx::Rect&, const gfx::Rect&));
- };
#endif
// This is a generic Buffer tracker
@@ -154,14 +139,7 @@ class VideoCaptureBufferPoolTest
#if !defined(OS_ANDROID)
void SetUp() override {
- scoped_refptr<cc::TestContextProvider> context_provider =
- cc::TestContextProvider::Create(cc::TestWebGraphicsContext3D::Create());
- context_provider->BindToCurrentThread();
gpu_memory_buffer_manager_.reset(new StubBrowserGpuMemoryBufferManager);
- output_surface_.reset(new MockBufferQueue(context_provider,
- gpu_memory_buffer_manager_.get(),
- GL_TEXTURE_2D, GL_RGBA));
- output_surface_->Initialize();
}
#endif
@@ -211,7 +189,6 @@ class VideoCaptureBufferPoolTest
private:
#if !defined(OS_ANDROID)
std::unique_ptr<StubBrowserGpuMemoryBufferManager> gpu_memory_buffer_manager_;
- std::unique_ptr<MockBufferQueue> output_surface_;
#endif
DISALLOW_COPY_AND_ASSIGN(VideoCaptureBufferPoolTest);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698