Revert of [chromecast] Make testnames consistent.

chromecast/browser/BUILD.gn

Index: chromecast/browser/BUILD.gn
diff --git a/chromecast/browser/BUILD.gn b/chromecast/browser/BUILD.gn
index 9937c5447fdc83c0aa29ce44202fb7aba3703ddb..fc29e23076a672f19ae9cc30d979c5193200c975 100644
--- a/chromecast/browser/BUILD.gn
+++ b/chromecast/browser/BUILD.gn
@@ -158,18 +158,22 @@
 
 source_set("test_support") {
   testonly = true
-  sources = [
-    "test/cast_browser_test.cc",
-    "test/cast_browser_test.h",
+
+  sources = [
+    "test/chromecast_browser_test.cc",
+    "test/chromecast_browser_test.h",
+    "test/chromecast_browser_test_runner.cc",
   ]
 
   public_deps = [
     ":browser",
+    "//chromecast:cast_shell_lib",
     "//content/test:test_support",
   ]
 
   deps = [
     "//base",
+    "//chromecast/app",
     "//chromecast/base",
     "//content/public/browser",
     "//content/public/common",
@@ -177,37 +181,51 @@
   ]
 }
 
-source_set("browsertests") {
-  testonly = true
-  sources = [
-    "cast_media_blocker_browsertest.cc",
-    "test/cast_navigation_browsertest.cc",
-  ]
-
+config("browser_test_config") {
   defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
+}
+
+test("cast_shell_tests") {
+  sources = [
+    "test/cast_devtools_delegate_test.cc",
+    "test/cast_media_blocker_test.cc",
+    "test/cast_test_launcher.cc",
+  ]
+
+  deps = [
+    ":browser",
+    "//base",
+    "//chromecast/app",
+    "//chromecast/base",
+    "//content/test:test_support",
+    "//mojo/edk/system",
+    "//testing/gtest",
+  ]
+}
+
+test("cast_shell_browser_test") {
+  sources = [
+    "test/chromecast_shell_browser_test.cc",
+    "test/chromecast_shell_media_blocking_browser_test.cc",
+  ]
+
+  configs += [ ":browser_test_config" ]
 
   deps = [
     ":test_support",
+    "//base",
     "//chromecast:chromecast_features",
+    "//content/test:test_support",
     "//media/base:test_support",
-  ]
-}
-
-source_set("unittests") {
-  testonly = true
-
-  sources = [
-    "cast_media_blocker_unittest.cc",
-    "devtools/cast_devtools_manager_delegate_unittest.cc",
-  ]
-
-  deps = [
-    ":browser",
-    "//base",
-    "//chromecast/base",
-    "//content/public/browser",
-    "//content/test:test_support",
-  ]
+    "//testing/gtest",
+    "//url",
+  ]
+
+  if (chromecast_branding == "public") {
+    # Link default libcast_media_1.0 statically not to link dummy one
+    # dynamically for public unittests.
+    deps += [ "//chromecast/media/base:libcast_media_1.0_default_core" ]
+  }
 }
 
 if (is_android) {