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

Unified Diff: content/browser/media/capture/screen_capture_device_android_unittest.cc

Issue 2518143004: [Mojo Video Capture] Replace RESOURCE_UTILIZATION with interface ReceiverLoadObserver (Closed)
Patch Set: Fix for android-only code Created 4 years 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/media/capture/screen_capture_device_android_unittest.cc
diff --git a/content/browser/media/capture/screen_capture_device_android_unittest.cc b/content/browser/media/capture/screen_capture_device_android_unittest.cc
index f903f19f761f5da6ad4f9723dd3d32eb04b9e816..1eaa60cd3dbdd3d387b65151ac9fa7a92624a26a 100644
--- a/content/browser/media/capture/screen_capture_device_android_unittest.cc
+++ b/content/browser/media/capture/screen_capture_device_android_unittest.cc
@@ -16,13 +16,14 @@ const int kFrameRate = 30;
class MockDeviceClient : public media::VideoCaptureDevice::Client {
public:
- MOCK_METHOD6(OnIncomingCapturedData,
+ MOCK_METHOD7(OnIncomingCapturedData,
void(const uint8_t* data,
int length,
const media::VideoCaptureFormat& frame_format,
int rotation,
base::TimeTicks reference_time,
- base::TimeDelta tiemstamp));
+ base::TimeDelta tiemstamp,
+ int frame_feedback_id));
MOCK_METHOD0(DoReserveOutputBuffer, void(void));
MOCK_METHOD0(DoOnIncomingCapturedBuffer, void(void));
MOCK_METHOD0(DoOnIncomingCapturedVideoFrame, void(void));
@@ -33,10 +34,10 @@ class MockDeviceClient : public media::VideoCaptureDevice::Client {
MOCK_CONST_METHOD0(GetBufferPoolUtilization, double(void));
// Trampoline methods to workaround GMOCK problems with std::unique_ptr<>.
- std::unique_ptr<Buffer> ReserveOutputBuffer(
- const gfx::Size& dimensions,
- media::VideoPixelFormat format,
- media::VideoPixelStorage storage) override {
+ std::unique_ptr<Buffer> ReserveOutputBuffer(const gfx::Size& dimensions,
+ media::VideoPixelFormat format,
+ media::VideoPixelStorage storage,
+ int frame_feedback_id) override {
EXPECT_EQ(media::PIXEL_FORMAT_I420, format);
EXPECT_EQ(media::PIXEL_STORAGE_CPU, storage);
DoReserveOutputBuffer();
@@ -56,7 +57,8 @@ class MockDeviceClient : public media::VideoCaptureDevice::Client {
std::unique_ptr<Buffer> ResurrectLastOutputBuffer(
const gfx::Size& dimensions,
media::VideoPixelFormat format,
- media::VideoPixelStorage storage) override {
+ media::VideoPixelStorage storage,
+ int frame_feedback_id) override {
EXPECT_EQ(media::PIXEL_FORMAT_I420, format);
EXPECT_EQ(media::PIXEL_STORAGE_CPU, storage);
DoResurrectLastOutputBuffer();

Powered by Google App Engine
This is Rietveld 408576698