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

Unified Diff: content/content_tests.gypi

Issue 93583003: Reland 237634 and 237645. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase at 237726. Created 7 years, 1 month 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 | « content/content_browser.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index bcd072844b08a5dea25b38a8d665c7cafef9a7cc..a75d2636b16af4cf5c2b03f3ae2c1fd188b1c9d3 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -713,6 +713,11 @@
'../third_party/webrtc/modules/modules.gyp:desktop_capture',
],
}],
+ ['enable_webrtc==1 and chromeos==1', {
+ 'sources': [
+ 'browser/renderer_host/media/desktop_capture_device_ash_unittest.cc',
+ ],
+ }],
# TODO(jrg): remove the OS=="android" section?
# http://crbug.com/113172
# Understand better how media_stream_ is tied into Chromium.
« no previous file with comments | « content/content_browser.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698