Revert of Media Router GYP/GN cleanup

chrome/chrome_tests_unit.gypi

Index: chrome/chrome_tests_unit.gypi
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 9611f7a94d8d343774c99fc3e78ede2846ae7d13..4ecceaa47d9b3d68b49c98d54604c3c903c8b032 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -1419,21 +1419,6 @@
       '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',
-    ],
     # Everything but Android and iOS (iOS is handled separately).
     'chrome_unit_tests_non_android_sources': [
       # Bookmark export/import are handled via the BookmarkColumns
@@ -2354,8 +2339,9 @@
           'sources': [ '<@(chrome_unit_tests_print_preview_sources)' ],
         }],
         ['enable_media_router==1', {
-          'sources': [ '<@(chrome_unit_tests_media_router_sources)' ],
-          'dependencies': [ 'browser/media/router/media_router.gyp:media_router_test_support' ],
+          'includes': [
+            'browser/media/router/media_router_tests.gypi',
+          ],
         }],
         ['enable_captive_portal_detection==1', {
           'sources': [ '<@(chrome_unit_tests_captive_portal_sources)' ],