[Media Router] Reland of "Media Router GYP/GN cleanup".

chrome/chrome_tests_unit.gypi

 # Copyright 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'variables': {
     'chrome_unit_tests_sources': [
       '../components/autofill/content/renderer/test_password_autofill_agent.cc',
       '../components/autofill/content/renderer/test_password_autofill_agent.h',
       '../components/autofill/content/renderer/test_password_generation_agent.cc',
       '../components/autofill/content/renderer/test_password_generation_agent.h',
@@ skipping 1402 matching lines @@
       'browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc',
       'browser/supervised_user/legacy/supervised_user_shared_settings_update_unittest.cc',
       'browser/supervised_user/legacy/supervised_user_sync_service_unittest.cc',
       'browser/supervised_user/supervised_user_bookmarks_handler_unittest.cc',
       'browser/supervised_user/supervised_user_pref_store_unittest.cc',
       'browser/supervised_user/supervised_user_service_unittest.cc',
       'browser/supervised_user/supervised_user_settings_service_unittest.cc',
       'browser/supervised_user/supervised_user_url_filter_unittest.cc',
       'browser/supervised_user/supervised_user_whitelist_service_unittest.cc',
     ],
+    'chrome_unit_tests_media_router_sources': [
+      'browser/media/router/issue_manager_unittest.cc',
+      'browser/media/router/issue_unittest.cc',
+      'browser/media/router/media_router_type_converters_unittest.cc',
+      'browser/media/router/media_route_unittest.cc',
+      'browser/media/router/media_sink_unittest.cc',
+      'browser/media/router/media_source_helper_unittest.cc',
+      'browser/media/router/media_source_unittest.cc',
+      'browser/media/router/presentation_media_sinks_observer_unittest.cc',
+      'browser/media/router/route_id_manager_unittest.cc',
+      'browser/ui/webui/media_router/media_cast_mode_unittest.cc',
+      'browser/ui/webui/media_router/media_router_dialog_controller_unittest.cc',
+      'browser/ui/webui/media_router/media_router_test.cc',
+      'browser/ui/webui/media_router/media_router_test.h',
+      'browser/ui/webui/media_router/query_result_manager_unittest.cc',
+    ],
     # Everything but Android and iOS (iOS is handled separately).
     'chrome_unit_tests_non_android_sources': [
       # Bookmark export/import are handled via the BookmarkColumns
       # ContentProvider.
       'browser/bookmarks/bookmark_html_writer_unittest.cc',
       'browser/browser_commands_unittest.cc',
       'browser/diagnostics/diagnostics_controller_unittest.cc',
       'browser/diagnostics/diagnostics_model_unittest.cc',
       'browser/download/download_commands_unittest.cc',
       'browser/download/download_shelf_unittest.cc',
@@ skipping 83 matching lines @@
       'browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.cc',
       'browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.h',
       'browser/ui/toolbar/test_toolbar_model.cc',
       'browser/ui/toolbar/test_toolbar_model.h',
       'browser/ui/toolbar/toolbar_actions_bar_unittest.cc',
       'browser/ui/toolbar/toolbar_model_unittest.cc',
       'browser/ui/toolbar/wrench_icon_painter_unittest.cc',
       'browser/ui/toolbar/wrench_menu_model_unittest.cc',
       'browser/ui/website_settings/permission_menu_model_unittest.cc',
       'browser/ui/webui/help/version_updater_chromeos_unittest.cc',
-      'browser/ui/webui/media_router/media_cast_mode_unittest.cc',
-      'browser/ui/webui/media_router/query_result_manager_unittest.cc',
       'browser/ui/webui/ntp/ntp_user_data_logger_unittest.cc',
       'browser/ui/webui/ntp/suggestions_combiner_unittest.cc',
       'browser/ui/webui/options/autofill_options_handler_unittest.cc',
       'browser/ui/webui/options/language_options_handler_unittest.cc',
       'browser/ui/webui/options/pepper_flash_content_settings_utils_unittest.cc',
       'browser/ui/webui/options/sync_setup_handler_unittest.cc',
       'browser/ui/webui/signin/login_ui_service_unittest.cc',
       'browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc',
       'browser/ui/window_sizer/window_sizer_common_unittest.cc',
       'browser/ui/window_sizer/window_sizer_unittest.cc',
@@ skipping 805 matching lines @@
         ['enable_autofill_dialog==1 and OS!="android"', {
           'sources': [ '<@(chrome_unit_tests_autofill_dialog_sources)' ],
         }],
         ['enable_plugins==1', {
           'sources': [ '<@(chrome_unit_tests_plugins_sources)' ],
         }],
         ['enable_print_preview==1', {
           'sources': [ '<@(chrome_unit_tests_print_preview_sources)' ],
         }],
         ['enable_media_router==1', {
-          'includes': [
-            'browser/media/router/media_router_tests.gypi',
-          ],
+          'sources': [ '<@(chrome_unit_tests_media_router_sources)' ],
+          'dependencies': [ 'browser/media/router/media_router.gyp:media_router_test_support' ],
         }],
         ['enable_captive_portal_detection==1', {
           'sources': [ '<@(chrome_unit_tests_captive_portal_sources)' ],
         }],
         ['enable_session_service==1', {
           'sources': [ '<@(chrome_unit_tests_session_service_sources)' ],
         }],
         ['enable_webrtc==1', {
           'sources': [ '<@(chrome_unit_tests_webrtc_sources)' ],
         }],
@@ skipping 432 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }