Reland: [chromecast] Make testnames consistent.

Reland: [chromecast] Make testnames consistent.

Note that cast_shell_tests were not being run on the bots. This patch
moves it into a top-level cast_shell_unittests target.

BUG=665489
Committed: https://crrev.com/e3bd5edddfc78fba54b08bd35857dde2f8fa6c36
Cr-Commit-Position: refs/heads/master@{#432501}

[alokp, 2016-11-15 23:56:37]

alokp@chromium.org changed reviewers:
+ dpranke@chromium.org, sky@chromium.org

[alokp, 2016-11-15 23:56:38]

The first patch is the same as https://codereview.chromium.org/2499563002, which
was reverted.

The second patchset fixes isolate.

[alokp, 2016-11-16 00:00:59]

sky@: PTAL at content dependencies. I am not adding any new dependency - just
moving them from chromecast/browser to chromecast/app.

[Dirk Pranke, 2016-11-16 00:20:46]

lgtm

[sky, 2016-11-16 01:51:07]

LGTM

[alokp, 2016-11-16 03:04:37]

The CQ bit was checked by alokp@chromium.org

[commit-bot: I haz the power, 2016-11-16 03:05:12]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-11-16 03:59:41]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-11-16 03:59:42]

Try jobs failed on following builders:
  win_chromium_rel_ng on master.tryserver.chromium.win (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_...)

[alokp, 2016-11-16 05:12:23]

The CQ bit was checked by alokp@chromium.org

[commit-bot: I haz the power, 2016-11-16 05:12:56]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-11-16 06:51:17]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-11-16 06:51:18]

Failed to apply patch for chromecast/BUILD.gn:
While running git apply --index -p1;
  error: patch failed: chromecast/BUILD.gn:276
  error: chromecast/BUILD.gn: patch does not apply

Patch:       chromecast/BUILD.gn
Index: chromecast/BUILD.gn
diff --git a/chromecast/BUILD.gn b/chromecast/BUILD.gn
index
e90b8927c504b6e69a21cf52c52d21c07d4c3bad..ecda48cabb161999288cde72d7b450b9b5329e17
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,27 @@ if (is_android) {
   }
 }
 
+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",

[alokp, 2016-11-16 13:46:40]

The CQ bit was checked by alokp@chromium.org

[alokp, 2016-11-16 13:46:40]

The patchset sent to the CQ was uploaded after l-g-t-m from
dpranke@chromium.org, sky@chromium.org
Link to the patchset: https://codereview.chromium.org/2510473002/#ps40001
(title: "rebase")

[commit-bot: I haz the power, 2016-11-16 13:47:03]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-11-16 15:57:40]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2016-11-16 16:01:09]

Description was changed from

==========
Reland: [chromecast] Make testnames consistent.

Note that cast_shell_tests were not being run on the bots. This patch
moves it into a top-level cast_shell_unittests target.

BUG=665489
==========

to

==========
Reland: [chromecast] Make testnames consistent.

Note that cast_shell_tests were not being run on the bots. This patch
moves it into a top-level cast_shell_unittests target.

BUG=665489

Committed: https://crrev.com/e3bd5edddfc78fba54b08bd35857dde2f8fa6c36
Cr-Commit-Position: refs/heads/master@{#432501}
==========

[commit-bot: I haz the power, 2016-11-16 16:01:10]

Patchset 3 (id:??) landed as
https://crrev.com/e3bd5edddfc78fba54b08bd35857dde2f8fa6c36
Cr-Commit-Position: refs/heads/master@{#432501}