Reland: [chromecast] Make testnames consistent.

chromecast/BUILD.gn

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