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

chrome/test/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/module_args/v8.gni")
 import("//testing/test.gni")
@@ skipping 836 matching lines @@
       sources -= [
         "../browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc",
         "../browser/extensions/api/webrtc_logging_private/webrtc_logging_private_apitest.cc",
         "../browser/media/chrome_webrtc_browsertest.cc",
         "../browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc",
         "../browser/media/chrome_webrtc_getmediadevices_browsertest.cc",
       ]
     }
     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 += [
         "//chrome:other_version",
         "//third_party/wtl",
         "//ui/resources",
       ]
     } else {
       sources -= [
         "../app/chrome_command_ids.h",
@@ skipping 406 matching lines @@
       # Some android targets still depend on --gc-sections to link.
       # TODO: remove --gc-sections for Debug builds (crbug.com/159847).
       ldflags = [ "-Wl,--gc-sections" ]
       deps += [ "//testing/android/native_test:native_test_native_code" ]
     } else {
       sources +=
           rebase_path(unit_gypi_values.chrome_unit_tests_non_android_sources,
                       ".",
                       "//chrome")
     }
-
     if (is_ios || is_chromeos) {
       sources -=
           [ "../browser/metrics/signin_status_metrics_provider_unittest.cc" ]
     }
     if (enable_background) {
       sources +=
           rebase_path(unit_gypi_values.chrome_unit_tests_background_sources,
                       ".",
                       "//chrome")
     }
@@ skipping 186 matching lines @@
           rebase_path(unit_gypi_values.chrome_unit_tests_captive_portal_sources,
                       ".",
                       "//chrome")
     }
     if (enable_session_service) {
       sources += rebase_path(
               unit_gypi_values.chrome_unit_tests_session_service_sources,
               ".",
               "//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,
                       ".",
                       "//chrome")
       deps += [
         "//ash/resources",
         "//ui/chromeos/resources",
       ]
       sources -= [
@@ skipping 250 matching lines @@
       }
 
       if (cld_version == 0 || cld_version == 2) {
         # Use whatever CLD2 data access mode that the
         # application embedder is using.
         deps += [ "//third_party/cld_2:cld2_platform_impl" ]
       }
     }
   }
 }