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

Unified Diff: webrtc/modules/desktop_capture/screen_capturer_unittest.cc

Issue 2409833002: Remove DesktopRegion parameter in DesktopCapturer::Capture. (Closed)
Patch Set: Change Capture2 to CaptureFrame Created 4 years, 2 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: webrtc/modules/desktop_capture/screen_capturer_unittest.cc
diff --git a/webrtc/modules/desktop_capture/screen_capturer_unittest.cc b/webrtc/modules/desktop_capture/screen_capturer_unittest.cc
index fa666a929b95a2357d11ed70beb6b64024fb2dd3..ce0cab1fd3c03f9e235c51852da4361625a98645 100644
--- a/webrtc/modules/desktop_capture/screen_capturer_unittest.cc
+++ b/webrtc/modules/desktop_capture/screen_capturer_unittest.cc
@@ -204,7 +204,7 @@ class ScreenCapturerTest : public testing::Test {
EXPECT_CALL(callback_,
OnCaptureResultPtr(DesktopCapturer::Result::SUCCESS, _))
.WillOnce(SaveUniquePtrArg(&frame));
- capturer->Capture(DesktopRegion());
+ capturer->CaptureFrame();
EXPECT_TRUE(frame);
return frame;
}
@@ -259,7 +259,7 @@ TEST_F(ScreenCapturerTest, Capture) {
.WillOnce(SaveUniquePtrArg(&frame));
capturer_->Start(&callback_);
- capturer_->Capture(DesktopRegion());
+ capturer_->CaptureFrame();
ASSERT_TRUE(frame);
EXPECT_GT(frame->size().width(), 0);
@@ -302,7 +302,7 @@ TEST_F(ScreenCapturerTest, UseSharedBuffers) {
capturer_->Start(&callback_);
capturer_->SetSharedMemoryFactory(
std::unique_ptr<SharedMemoryFactory>(new FakeSharedMemoryFactory()));
- capturer_->Capture(DesktopRegion());
+ capturer_->CaptureFrame();
ASSERT_TRUE(frame);
ASSERT_TRUE(frame->shared_memory());
@@ -318,7 +318,7 @@ TEST_F(ScreenCapturerTest, UseMagnifier) {
.WillOnce(SaveUniquePtrArg(&frame));
capturer_->Start(&callback_);
- capturer_->Capture(DesktopRegion());
+ capturer_->CaptureFrame();
ASSERT_TRUE(frame);
}
@@ -333,7 +333,7 @@ TEST_F(ScreenCapturerTest, UseDirectxCapturer) {
.WillOnce(SaveUniquePtrArg(&frame));
capturer_->Start(&callback_);
- capturer_->Capture(DesktopRegion());
+ capturer_->CaptureFrame();
ASSERT_TRUE(frame);
}
@@ -350,7 +350,7 @@ TEST_F(ScreenCapturerTest, UseDirectxCapturerWithSharedBuffers) {
capturer_->Start(&callback_);
capturer_->SetSharedMemoryFactory(
std::unique_ptr<SharedMemoryFactory>(new FakeSharedMemoryFactory()));
- capturer_->Capture(DesktopRegion());
+ capturer_->CaptureFrame();
ASSERT_TRUE(frame);
ASSERT_TRUE(frame->shared_memory());
EXPECT_EQ(frame->shared_memory()->id(), kTestSharedMemoryId);
« no previous file with comments | « webrtc/modules/desktop_capture/screen_capturer_mock_objects.h ('k') | webrtc/modules/desktop_capture/screen_capturer_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698