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

Unified Diff: media/video/capture/screen/screen_capturer_mac_unittest.cc

Issue 14305004: Simplify ScreenCapturer interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
Index: media/video/capture/screen/screen_capturer_mac_unittest.cc
diff --git a/media/video/capture/screen/screen_capturer_mac_unittest.cc b/media/video/capture/screen/screen_capturer_mac_unittest.cc
index 9afd7f282a08e22c30ff88795b9577984e5047b2..a30ac5a7c12659f6ce3380e88a13c6309cda6b14 100644
--- a/media/video/capture/screen/screen_capturer_mac_unittest.cc
+++ b/media/video/capture/screen/screen_capturer_mac_unittest.cc
@@ -35,14 +35,8 @@ class ScreenCapturerMacTest : public testing::Test {
capturer_ = ScreenCapturer::Create();
}
- void AddDirtyRect() {
- SkIRect rect = SkIRect::MakeXYWH(0, 0, 10, 10);
- region_.op(rect, SkRegion::kUnion_Op);
- }
-
scoped_ptr<ScreenCapturer> capturer_;
MockScreenCapturerDelegate delegate_;
- SkRegion region_;
};
void ScreenCapturerMacTest::CaptureDoneCallback1(
@@ -60,7 +54,6 @@ void ScreenCapturerMacTest::CaptureDoneCallback2(
int width = CGDisplayPixelsWide(mainDevice);
int height = CGDisplayPixelsHigh(mainDevice);
- EXPECT_EQ(region_, capture_data->dirty_region());
EXPECT_EQ(width, capture_data->size().width());
EXPECT_EQ(height, capture_data->size().height());
EXPECT_TRUE(capture_data->data() != NULL);
@@ -89,10 +82,7 @@ TEST_F(ScreenCapturerMacTest, Capture) {
capturer_->CaptureFrame();
// Check that subsequent dirty rects are propagated correctly.
- AddDirtyRect();
- capturer_->InvalidateRegion(region_);
capturer_->CaptureFrame();
- capturer_->Stop();
}
} // namespace media
« no previous file with comments | « media/video/capture/screen/screen_capturer_mac.mm ('k') | media/video/capture/screen/screen_capturer_mock_objects.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698