Revert of Media Router GYP/GN cleanup

BUILD.gn

 # Copyright (c) 2013 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.
 
 # This is the root build file for GN. GN will start processing by loading this
 # file, and recursively load all dependencies until all dependencies are either
 # resolved or known not to exist (which will cause the build to fail). So if
 # you add a new build file, there must be some path of dependencies from this
 # file to your new one or GN won't know about it.
 
@@ skipping 151 matching lines @@
   ]
 
   deps += root_extra_deps
 
   if (enable_extensions && !is_mac) {
     # TODO(GYP): Get this working on the mac?
     deps += [ "//extensions/shell:app_shell_unittests" ]
   }
 
   if (enable_media_router) {
-    deps += [ "//chrome/browser/media/router" ]
+    deps += [
+      "//chrome/browser/media/router/",
+      "//chrome/browser/media/router:unit_tests",
+    ]
   }
 
   if (enable_remoting) {
     deps += [ "//remoting:remoting_all" ]
   }
 
   if (toolkit_views) {
     deps += [ "//ui/views:views_unittests" ]
   }
 
@@ skipping 722 matching lines @@
       "//ui/views:views_unittests",  # TooltipControllerTest failures
       "//ui/wm:wm_unittests",  # PASSES 4/21/2015
       "//url:url_unittests",  # PASSES 4/17/2015
 
       # TODO(GYP) nacl_integration
       # TODO(GYP) telemetry_perf_unittests
       # TODO(GYP) telemetry_unittests
     ]
   }
 }