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

Unified Diff: webrtc/modules/BUILD.gn

Issue 2444583002: Move ScreenCapturer 'real' tests out of screen_capturer_unittest.cc. (Closed)
Patch Set: Resolve review comments 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
« no previous file with comments | « no previous file | webrtc/modules/desktop_capture/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/BUILD.gn
diff --git a/webrtc/modules/BUILD.gn b/webrtc/modules/BUILD.gn
index 6c472a399f0dae5fd090e7a4a7343591978367b8..3dbc1a3ea0ec497b779eda2c86609a7a279dd82d 100644
--- a/webrtc/modules/BUILD.gn
+++ b/webrtc/modules/BUILD.gn
@@ -70,6 +70,7 @@ if (rtc_include_tests) {
"../system_wrappers",
"../test:test_support",
"../test:test_support_main",
+ "//testing/gmock",
"//testing/gtest",
]
@@ -95,6 +96,11 @@ if (rtc_include_tests) {
"video_coding/codecs/vp8/test/vp8_impl_unittest.cc",
]
+ if (rtc_desktop_capture_supported) {
+ deps += [ "desktop_capture:desktop_capture_test_tools" ]
+ sources += [ "desktop_capture/screen_capturer_integration_test.cc" ]
+ }
+
data = modules_tests_resources
if (is_android) {
@@ -534,7 +540,7 @@ if (rtc_include_tests) {
}
if (rtc_desktop_capture_supported) {
- deps += [ "desktop_capture" ]
+ deps += [ "desktop_capture:desktop_capture_test_tools" ]
sources += [
"desktop_capture/desktop_and_cursor_composer_unittest.cc",
"desktop_capture/desktop_frame_generator.cc",
@@ -543,20 +549,13 @@ if (rtc_include_tests) {
"desktop_capture/fake_screen_capturer.cc",
"desktop_capture/fake_screen_capturer.h",
"desktop_capture/mouse_cursor_monitor_unittest.cc",
- "desktop_capture/rgba_color.cc",
- "desktop_capture/rgba_color.h",
"desktop_capture/rgba_color_unittest.cc",
"desktop_capture/screen_capturer_differ_wrapper_unittest.cc",
"desktop_capture/screen_capturer_helper_unittest.cc",
"desktop_capture/screen_capturer_mac_unittest.cc",
"desktop_capture/screen_capturer_mock_objects.h",
"desktop_capture/screen_capturer_unittest.cc",
- "desktop_capture/screen_drawer.cc",
- "desktop_capture/screen_drawer.h",
- "desktop_capture/screen_drawer_linux.cc",
- "desktop_capture/screen_drawer_mac.cc",
"desktop_capture/screen_drawer_unittest.cc",
- "desktop_capture/screen_drawer_win.cc",
"desktop_capture/win/cursor_unittest.cc",
"desktop_capture/win/cursor_unittest_resources.h",
"desktop_capture/win/cursor_unittest_resources.rc",
« no previous file with comments | « no previous file | webrtc/modules/desktop_capture/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698