Revert of [chromecast] Make testnames consistent.

chromecast/BUILD.gn

Index: chromecast/BUILD.gn
diff --git a/chromecast/BUILD.gn b/chromecast/BUILD.gn
index ecda48cabb161999288cde72d7b450b9b5329e17..e90b8927c504b6e69a21cf52c52d21c07d4c3bad 100644
--- a/chromecast/BUILD.gn
+++ b/chromecast/BUILD.gn
@@ -61,8 +61,8 @@
 
   if (!is_android) {
     tests += [
-      ":cast_shell_browsertests",
-      ":cast_shell_unittests",
+      "//chromecast/app:cast_shell_unittests",
+      "//chromecast/browser:cast_shell_browser_test",
       "//chromecast/media:cast_media_unittests",
       "//ipc:ipc_tests",
       "//jingle:jingle_unittests",
@@ -77,8 +77,8 @@
     }
     filters += [ cast_media_unittests_filter ]
 
-    cast_shell_browsertests_filter = {
-      test_name = "cast_shell_browsertests"
+    cast_shell_browser_test_filter = {
+      test_name = "cast_shell_browser_test"
 
       # --enable-local-file-accesses => to load sample media files
       # --test-launcher-jobs=1 => so internal code can bind to port
@@ -93,7 +93,7 @@
         args += [ "--use-gpu-in-tests" ]
       }
     }
-    filters += [ cast_shell_browsertests_filter ]
+    filters += [ cast_shell_browser_test_filter ]
 
     ipc_tests_filter = {
       test_name = "ipc_tests"
@@ -276,27 +276,6 @@
   }
 }
 
-test("cast_shell_unittests") {
-  deps = [
-    "//chromecast/app:test_support",
-    "//chromecast/app:unittests",
-    "//chromecast/browser:unittests",
-  ]
-}
-
-test("cast_shell_browsertests") {
-  deps = [
-    "//chromecast/app:test_support",
-    "//chromecast/browser:browsertests",
-  ]
-
-  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" ]
-  }
-}
-
 group("cast_shell_lib") {
   deps = [
     "//chromecast/app",