Index: media/video/capture/screen/screen_capturer_helper_unittest.cc |
diff --git a/remoting/capturer/video_frame_capturer_helper_unittest.cc b/media/video/capture/screen/screen_capturer_helper_unittest.cc |
similarity index 91% |
rename from remoting/capturer/video_frame_capturer_helper_unittest.cc |
rename to media/video/capture/screen/screen_capturer_helper_unittest.cc |
index a362c343e305c64966c6b58c2d334338f7e0f092..dc222316c8dc04382c26f8a01b3318fc2ea91fbd 100644 |
--- a/remoting/capturer/video_frame_capturer_helper_unittest.cc |
+++ b/media/video/capture/screen/screen_capturer_helper_unittest.cc |
@@ -2,16 +2,16 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "remoting/capturer/video_frame_capturer_helper.h" |
+#include "media/video/capture/screen/screen_capturer_helper.h" |
#include "base/memory/scoped_ptr.h" |
#include "testing/gtest/include/gtest/gtest.h" |
-namespace remoting { |
+namespace media { |
-class VideoFrameCapturerHelperTest : public testing::Test { |
+class ScreenCapturerHelperTest : public testing::Test { |
protected: |
- VideoFrameCapturerHelper capturer_helper_; |
+ ScreenCapturerHelper capturer_helper_; |
}; |
bool Equals(const SkRegion& region1, const SkRegion& region2) { |
@@ -35,7 +35,7 @@ bool Equals(const SkRegion& region1, const SkRegion& region2) { |
return true; |
} |
-TEST_F(VideoFrameCapturerHelperTest, ClearInvalidRegion) { |
+TEST_F(ScreenCapturerHelperTest, ClearInvalidRegion) { |
SkRegion region; |
capturer_helper_.InvalidateRegion(SkRegion(SkIRect::MakeXYWH(1, 2, 3, 4))); |
capturer_helper_.ClearInvalidRegion(); |
@@ -43,7 +43,7 @@ TEST_F(VideoFrameCapturerHelperTest, ClearInvalidRegion) { |
ASSERT_TRUE(region.isEmpty()); |
} |
-TEST_F(VideoFrameCapturerHelperTest, InvalidateRegion) { |
+TEST_F(ScreenCapturerHelperTest, InvalidateRegion) { |
SkRegion region; |
capturer_helper_.SwapInvalidRegion(®ion); |
ASSERT_TRUE(Equals(SkRegion(SkIRect::MakeEmpty()), region)); |
@@ -60,14 +60,14 @@ TEST_F(VideoFrameCapturerHelperTest, InvalidateRegion) { |
ASSERT_TRUE(Equals(SkRegion(SkIRect::MakeXYWH(1, 2, 6, 4)), region)); |
} |
-TEST_F(VideoFrameCapturerHelperTest, InvalidateScreen) { |
+TEST_F(ScreenCapturerHelperTest, InvalidateScreen) { |
SkRegion region; |
capturer_helper_.InvalidateScreen(SkISize::Make(12, 34)); |
capturer_helper_.SwapInvalidRegion(®ion); |
ASSERT_TRUE(Equals(SkRegion(SkIRect::MakeWH(12, 34)), region)); |
} |
-TEST_F(VideoFrameCapturerHelperTest, InvalidateFullScreen) { |
+TEST_F(ScreenCapturerHelperTest, InvalidateFullScreen) { |
SkRegion region; |
capturer_helper_.set_size_most_recent(SkISize::Make(12, 34)); |
capturer_helper_.InvalidateFullScreen(); |
@@ -75,13 +75,13 @@ TEST_F(VideoFrameCapturerHelperTest, InvalidateFullScreen) { |
ASSERT_TRUE(Equals(SkRegion(SkIRect::MakeWH(12, 34)), region)); |
} |
-TEST_F(VideoFrameCapturerHelperTest, SizeMostRecent) { |
+TEST_F(ScreenCapturerHelperTest, SizeMostRecent) { |
ASSERT_EQ(SkISize::Make(0, 0), capturer_helper_.size_most_recent()); |
capturer_helper_.set_size_most_recent(SkISize::Make(12, 34)); |
ASSERT_EQ(SkISize::Make(12, 34), capturer_helper_.size_most_recent()); |
} |
-TEST_F(VideoFrameCapturerHelperTest, SetLogGridSize) { |
+TEST_F(ScreenCapturerHelperTest, SetLogGridSize) { |
capturer_helper_.set_size_most_recent(SkISize::Make(10, 10)); |
SkRegion region; |
@@ -127,10 +127,10 @@ TEST_F(VideoFrameCapturerHelperTest, SetLogGridSize) { |
void TestExpandRegionToGrid(const SkRegion& region, int log_grid_size, |
const SkRegion& expandedRegionExpected) { |
scoped_ptr<SkRegion> expandedRegion1( |
- VideoFrameCapturerHelper::ExpandToGrid(region, log_grid_size)); |
+ ScreenCapturerHelper::ExpandToGrid(region, log_grid_size)); |
ASSERT_TRUE(Equals(expandedRegionExpected, *expandedRegion1)); |
scoped_ptr<SkRegion> expandedRegion2( |
- VideoFrameCapturerHelper::ExpandToGrid(*expandedRegion1, log_grid_size)); |
+ ScreenCapturerHelper::ExpandToGrid(*expandedRegion1, log_grid_size)); |
ASSERT_TRUE(Equals(*expandedRegion1, *expandedRegion2)); |
} |
@@ -142,7 +142,7 @@ void TestExpandRectToGrid(int l, int t, int r, int b, int log_grid_size, |
rExpanded, bExpanded))); |
} |
-TEST_F(VideoFrameCapturerHelperTest, ExpandToGrid) { |
+TEST_F(ScreenCapturerHelperTest, ExpandToGrid) { |
const int LOG_GRID_SIZE = 4; |
const int GRID_SIZE = 1 << LOG_GRID_SIZE; |
for (int i = -2; i <= 2; i++) { |
@@ -212,4 +212,4 @@ TEST_F(VideoFrameCapturerHelperTest, ExpandToGrid) { |
} |
} |
-} // namespace remoting |
+} // namespace media |