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

chrome/test/BUILD.gn

Index: chrome/test/BUILD.gn
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 65cf46cfbdf2e885a27455165d78120f3402d0ea..1447d54f081437c24334d7295839dc47e427eec1 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -854,9 +854,10 @@ if (!is_android) {
     }
     if (enable_media_router) {
       sources += rebase_path(
-              chrome_tests_gypi_values.chrome_browser_tests_media_router_webui_sources,
+              chrome_tests_gypi_values.chrome_browser_tests_media_router_sources,
               ".",
               "//chrome")
+      deps += [ "//chrome/browser/media/router:test_support" ]
     }
     if (is_win) {
       deps += [
@@ -1283,7 +1284,6 @@ if (!is_android) {
                       ".",
                       "//chrome")
     }
-
     if (is_ios || is_chromeos) {
       sources -=
           [ "../browser/metrics/signin_status_metrics_provider_unittest.cc" ]
@@ -1490,14 +1490,18 @@ if (!is_android) {
               ".",
               "//chrome")
     }
+    if (enable_media_router) {
+      sources +=
+          rebase_path(unit_gypi_values.chrome_unit_tests_media_router_sources,
+                      ".",
+                      "//chrome")
+      deps += [ "//chrome/browser/media/router:test_support" ]
+    }
     if (enable_webrtc) {
       sources += rebase_path(unit_gypi_values.chrome_unit_tests_webrtc_sources,
                              ".",
                              "//chrome")
     }
-    if (enable_media_router) {
-      deps += [ "//chrome/browser/media/router:unit_tests" ]
-    }
     if (is_chromeos) {
       sources +=
           rebase_path(unit_gypi_values.chrome_unit_tests_chromeos_sources,