Revert of [chromecast] Make testnames consistent.

chromecast/browser/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/config/ui.gni")
 import("//chromecast/chromecast.gni")
 import("//testing/test.gni")
 import("//tools/grit/grit_rule.gni")
 
 if (is_android) {
@@ skipping 140 matching lines @@
   use_qualified_include = true
   output_dir = "$root_gen_dir/chromecast/browser"
   outputs = [
     "grit/cast_browser_resources.h",
     "cast_browser_resources.pak",
   ]
 }
 
 source_set("test_support") {
   testonly = true
+
   sources = [
-    "test/cast_browser_test.cc",
-    "test/cast_browser_test.h",
+    "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",
     "//testing/gtest",
   ]
 }
 
-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" ]
-
-  deps = [
-    ":test_support",
-    "//chromecast:chromecast_features",
-    "//media/base:test_support",
-  ]
 }
 
-source_set("unittests") {
-  testonly = true
-
+test("cast_shell_tests") {
   sources = [
-    "cast_media_blocker_unittest.cc",
-    "devtools/cast_devtools_manager_delegate_unittest.cc",
+    "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/public/browser",
     "//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",
+    "//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) {
   generate_jni("jni_headers") {
     sources = [
       "android/apk/src/org/chromium/chromecast/shell/CastCrashHandler.java",
       "android/apk/src/org/chromium/chromecast/shell/CastMetricsHelper.java",
       "android/apk/src/org/chromium/chromecast/shell/CastSysInfoAndroid.java",
       "android/apk/src/org/chromium/chromecast/shell/CastWindowAndroid.java",
       "android/apk/src/org/chromium/chromecast/shell/CastWindowManager.java",
     ]
 
     jni_package = "chromecast"
   }
 }