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

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

Issue 2343423003: Extract nested and private classes from VideoCaptureBufferPool (Closed)
Patch Set: Merge branch 'master' into BufferPoolRefactor Created 4 years, 3 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
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 6fc58b6523709e99af06446ba10c38a587b9a011..9933c7635e394b19e077e60aa1748399e1e36606 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
@@ -24,6 +24,7 @@
#include "cc/test/test_web_graphics_context_3d.h"
#include "components/display_compositor/buffer_queue.h"
#include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
+#include "content/browser/renderer_host/media/video_capture_buffer_handle.h"
#include "content/browser/renderer_host/media/video_capture_controller.h"
#include "media/base/video_frame.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -119,7 +120,7 @@ class VideoCaptureBufferPoolTest
class Buffer {
public:
Buffer(const scoped_refptr<VideoCaptureBufferPool> pool,
- std::unique_ptr<VideoCaptureBufferPoolBufferHandle> buffer_handle,
+ std::unique_ptr<VideoCaptureBufferHandle> buffer_handle,
int id)
: id_(id), pool_(pool), buffer_handle_(std::move(buffer_handle)) {}
~Buffer() { pool_->RelinquishProducerReservation(id()); }
@@ -130,7 +131,7 @@ class VideoCaptureBufferPoolTest
private:
const int id_;
const scoped_refptr<VideoCaptureBufferPool> pool_;
- const std::unique_ptr<VideoCaptureBufferPoolBufferHandle> buffer_handle_;
+ const std::unique_ptr<VideoCaptureBufferHandle> buffer_handle_;
};
VideoCaptureBufferPoolTest()
@@ -164,7 +165,7 @@ class VideoCaptureBufferPoolTest
return std::unique_ptr<Buffer>();
EXPECT_EQ(expected_dropped_id_, buffer_id_to_drop);
- std::unique_ptr<VideoCaptureBufferPoolBufferHandle> buffer_handle =
+ std::unique_ptr<VideoCaptureBufferHandle> buffer_handle =
pool_->GetBufferHandle(buffer_id);
return std::unique_ptr<Buffer>(
new Buffer(pool_, std::move(buffer_handle), buffer_id));

Powered by Google App Engine
This is Rietveld 408576698