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

chrome/browser/ui/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/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 
 gypi_values = exec_script("//build/gypi_to_gn.py",
                           [ rebase_path("../../chrome_browser_ui.gypi") ],
@@ skipping 409 matching lines @@
   if (enable_google_now && !is_android) {
     sources += rebase_path(
             gypi_values.chrome_browser_ui_google_now_non_android_sources,
             ".",
             "//chrome")
   }
   if (enable_media_router) {
     sources += rebase_path(gypi_values.chrome_browser_ui_media_router_sources,
                            ".",
                            "//chrome")
-    deps += [ "//chrome/browser/media/router:router_core" ]
-    defines += [ "ENABLE_MEDIA_ROUTER=1" ]
+    deps += [ "//chrome/browser/media/router" ]
   }
   if (enable_webrtc) {
     sources += rebase_path(gypi_values.chrome_browser_ui_webrtc_sources,
                            ".",
                            "//chrome")
   }
   if (enable_service_discovery) {
     sources +=
         rebase_path(gypi_values.chrome_browser_ui_service_discovery_sources,
                     ".",
@@ skipping 64 matching lines @@
     "//chrome/browser",
     "//content/public/browser",
     "//content/public/common",
     "//content/test:test_support",
     "//net:test_support",
     "//skia",
     "//testing/gtest",
     "//ui/base",
   ]
 }