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

Unified Diff: chrome/chrome_tests.gypi

Issue 1149893020: [Media Router] Implement MediaRouterAction + MediaRouterUI tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed pkasting's 2nd comments Created 5 years, 6 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 | « chrome/browser/ui/webui/media_router/media_router_dialog_controller.cc ('k') | chrome/test/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index b5b1e2b6cd9e8de85ede9af4d8d4c3f6481d52cd..24d42f631083fe132fb36e776838e0e2de540082 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -622,6 +622,7 @@
'browser/ui/views/extensions/extension_message_bubble_view_browsertest.cc',
'browser/ui/views/frame/browser_view_browsertest.cc',
'browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc',
+ 'browser/ui/views/media_router/media_router_ui_browsertest.cc',
'browser/ui/views/profiles/avatar_menu_button_browsertest.cc',
'browser/ui/views/profiles/profile_chooser_view_browsertest.cc',
'browser/ui/views/toolbar/browser_actions_container_browsertest.cc',
@@ -2255,10 +2256,6 @@
'browser/media/chrome_webrtc_getmediadevices_browsertest.cc',
],
}],
- ['enable_media_router==1', {
- 'sources': [ '<@(chrome_browser_tests_media_router_sources)' ],
- 'dependencies': [ 'browser/media/router/media_router.gyp:media_router_test_support' ],
- }],
['OS=="win"', {
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
@@ -2447,6 +2444,15 @@
'test/data/webui/print_preview.js',
],
}],
+ ['enable_media_router==1', {
+ 'sources': [ '<@(chrome_browser_tests_media_router_sources)' ],
+ 'dependencies': [ 'browser/media/router/media_router.gyp:media_router_test_support' ],
+ 'conditions': [
+ ['toolkit_views==0', {
+ 'sources!': [ 'browser/ui/views/media_router/media_router_ui_browsertest.cc' ],
+ }],
+ ],
+ }],
['enable_mdns==1', {
'sources' : [
'browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc',
« no previous file with comments | « chrome/browser/ui/webui/media_router/media_router_dialog_controller.cc ('k') | chrome/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698