Revert of [chromecast] Make testnames consistent.

chromecast/BUILD.gn

 # Copyright 2015 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/buildflag_header.gni")
 import("//build/config/features.gni")
 import("//build/config/locales.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/ui.gni")
 import("//chromecast/build/tests/cast_test.gni")
@@ skipping 43 matching lines @@
   if (is_linux) {
     tests += [ "//chromecast/crash:cast_crash_unittests" ]
   }
 
   if (!is_android && use_alsa) {
     tests += [ "//chromecast/media/cma/backend/alsa:cast_alsa_cma_backend_unittests" ]
   }
 
   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",
       "//url:url_unittests",
     ]
 
     cast_media_unittests_filter = {
       test_name = "cast_media_unittests"
 
       # --test-launcher-jobs=1 => so internal code can bind to port
       args = [ "--test-launcher-jobs=1" ]
     }
     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
       args = [
         "--no-sandbox",
         "--enable-local-file-accesses",
         "--enable-cma-media-pipeline",
         "--ozone-platform=cast",
         "--test-launcher-jobs=1",
       ]
       if (!is_cast_desktop_build) {
         args += [ "--use-gpu-in-tests" ]
       }
     }
-    filters += [ cast_shell_browsertests_filter ]
+    filters += [ cast_shell_browser_test_filter ]
 
     ipc_tests_filter = {
       test_name = "ipc_tests"
 
       # --test-launcher-jobs=1 => so internal code can bind to port
       args = [ "--test-launcher-jobs=1" ]
     }
     filters += [ ipc_tests_filter ]
 
     url_unittests_filter = {
@@ skipping 162 matching lines @@
 
   cast_test_group_list("cast_junit_test_lists") {
     test_type = "junit"
     build_list_path = "$root_out_dir/junit/build_junit_test_list.txt"
     run_list_path = "$root_out_dir/junit/run_junit_test_list.txt"
     build_tests = true
     test_groups = [ ":cast_junit_tests" ]
   }
 }
 
-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",
     "//chromecast/browser",
     "//chromecast/common",
     "//chromecast/renderer",
   ]
 
   if (chromecast_branding != "public") {
     deps += [ "//chromecast/internal/shell" ]
@@ skipping 130 matching lines @@
     apk_name = "CastShell"
     android_manifest = "$root_gen_dir/cast_shell_manifest/AndroidManifest.xml"
     android_manifest_dep = "//chromecast/browser/android:cast_shell_manifest"
     deps = [
       ":cast_shell_apk_assets",
       "//chromecast/android:libcast_shell_android",
       "//chromecast/browser/android:cast_shell_java",
     ]
   }
 }