Index: chrome/chrome_tests.gypi |
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi |
index 443eb8c188c52e8bafe46763cd9ccb8708e30ea0..cc428d9a3de6665b8b4e52a850b639c5391127e1 100644 |
--- a/chrome/chrome_tests.gypi |
+++ b/chrome/chrome_tests.gypi |
@@ -618,6 +618,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', |
@@ -2251,10 +2252,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', |
@@ -2443,6 +2440,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', |