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

Unified Diff: content/content_tests.gypi

Issue 2190523004: ImageCapture: content_browsertest WebRtcImageCaptureBrowserTest CreateAndGetCapabilities (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed test entry for real-world capture device, leaving just FakeVCD Created 4 years, 5 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: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 3eba4cc07d87693d12219ea4c2224675c21bcf9e..6f031ba0140991089d55d02fa70f28b99e818fdd 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -310,14 +310,16 @@
'browser/media/webrtc/webrtc_browsertest_audio.cc',
'browser/media/webrtc/webrtc_browsertest_data.cc',
'browser/media/webrtc/webrtc_capture_from_element_browsertest.cc',
+ 'browser/media/webrtc/webrtc_content_browsertest_base.cc',
+ 'browser/media/webrtc/webrtc_content_browsertest_base.h',
'browser/media/webrtc/webrtc_datachannel_browsertest.cc',
'browser/media/webrtc/webrtc_getusermedia_browsertest.cc',
+ 'browser/media/webrtc/webrtc_image_capture_browsertest.cc',
'browser/media/webrtc/webrtc_internals_browsertest.cc',
'browser/media/webrtc/webrtc_ip_permissions_browsertest.cc',
'browser/media/webrtc/webrtc_media_recorder_browsertest.cc',
'browser/media/webrtc/webrtc_webcam_browsertest.cc',
- 'test/webrtc_content_browsertest_base.cc',
- 'test/webrtc_content_browsertest_base.h',
+ 'browser/media/webrtc/webrtc_webcam_browsertest.h',
],
'content_browsertests_plugins_sources': [
'renderer/pepper/fake_pepper_plugin_instance.cc',
@@ -770,8 +772,8 @@
],
# WebRTC-specific sources. Put WebRTC plugin-related stuff further below.
'content_unittests_webrtc_sources': [
- 'browser/media/webrtc/webrtc_internals_unittest.cc',
'browser/media/webrtc/webrtc_eventlog_host_unittest.cc',
+ 'browser/media/webrtc/webrtc_internals_unittest.cc',
'browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc',
'browser/renderer_host/p2p/socket_host_tcp_unittest.cc',
'browser/renderer_host/p2p/socket_host_test_utils.cc',
« no previous file with comments | « content/browser/media/webrtc/webrtc_webcam_browsertest.cc ('k') | content/test/data/media/image_capture_test.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698