| 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',
|
|
|