telemetry: Create telemetry_gtest_wrapper build group.

chrome/test/BUILD.gn

Index: chrome/test/BUILD.gn
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index d7fe75de648fd9fc0bc3532d6e7540da74326bd1..5590a3eecb9fdd943d4677ab10ae5e933693bb59 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -247,6 +247,40 @@ static_library("test_support") {
   }
 }
 
+# For isolate contract.
+group("telemetry_wrapper") {
+  testonly = true
+
+  data = [
+    "//testing/scripts/common.py",
+    "//testing/xvfb.py",

[Dirk Pranke, 2016/10/28 00:24:06]

These two files are actually automatically tacked on into the isolate by MB for
all targets, which may be why you're seeing them inconsistently specified now. I
don't think it's a bad thing to push them into the right place in GN, but that
right place is not in //chrome/test (it should be a target in //testing).

+  ]
+}
+
+group("telemetry_as_gtest") {
+  testonly = true
+
+  data = [
+    "//testing/scripts/run_telemetry_as_googletest.py",

[Dirk Pranke, 2016/10/28 00:24:06]

This is probably a better comment for your other CL, but if we're going to use
run_telemetry_as_googletest.py for non-telemetry-based tests, we should rename
or copy it first (and move it and as per the above). The webkit_layout_tests
target should not have dependencies on //chrome/test or anything in //chrome.

[nednguyen, 2016/10/28 00:26:37]

run_isolated_script_test.py?

[Ken Russell (switch to Gerrit), 2016/10/28 00:28:58]

Rather, run_xyz_as_isolated_script_test.py. I think there will need to be
several "xyz"s.

[eyaich1, 2016/10/28 12:46:34]

Yes I am actually adding another one in crrev.com/2442663004

+  ]
+
+  data_deps = [
+    ":telemetry_wrapper",
+  ]
+}
+
+group("telemetry_benchmark_as_gtest") {

[eyaich1, 2016/10/28 12:46:34]

I don't think a separate group is necessary for each one of the
run_xyz_as_isoalted_script_test.py.  You aren't really wrapping much, and I
think it is clearer for each target to know what script it depends on since that
drives the entire test on the swarming bot. 

+  testonly = true
+
+  data = [
+    "//testing/scripts/run_telemetry_benchmark_as_googletest.py",
+  ]
+
+  data_deps = [
+    ":telemetry_wrapper",
+  ]
+}
+
 # TODO(GYP_GONE): Delete this after we've converted everything to GN.
 # The _run targets exist only for compatibility w/ GYP.
 group("telemetry_gpu_test_run") {
@@ -263,11 +297,6 @@ group("telemetry_gpu_test") {
   ]
 
   data = [
-    # For isolate contract.
-    "//testing/scripts/common.py",
-    "//testing/xvfb.py",
-    "//testing/scripts/run_telemetry_benchmark_as_googletest.py",
-
     "//content/test/gpu/",
     "//content/test/data/gpu/",
 
@@ -278,6 +307,10 @@ group("telemetry_gpu_test") {
     "//third_party/webgl/",
     "//content/test/gpu/run_gpu_test.py",
   ]
+
+  data_deps = [
+    ":telemetry_benchmark_as_gtest",
+  ]
 }
 
 # TODO(GYP_GONE): Delete this after we've converted everything to GN.
@@ -1094,14 +1127,11 @@ if (!is_android) {
     deps = [
       "//tools/perf/chrome_telemetry_build:telemetry_chrome_test",
     ]
-
     data = [
       "//tools/perf/run_telemetry_tests",
-
-      # For isolate contract.
-      "//testing/scripts/common.py",
-      "//testing/xvfb.py",
-      "//testing/scripts/run_telemetry_as_googletest.py",
+    ]
+    data_deps = [
+      ":telemetry_as_gtest",
     ]
   }
 
@@ -1113,6 +1143,7 @@ if (!is_android) {
   }
 
   group("telemetry_gpu_unittests") {
+    testonly = true
     deps = [
       "//third_party/catapult/telemetry:telemetry_test_support",
     ]
@@ -1133,9 +1164,9 @@ if (!is_android) {
       # From telemetry_gpu_unittests.isolate
       "//third_party/pylint/",
       "//third_party/logilab/",
-      "//testing/scripts/common.py",
-      "//testing/xvfb.py",
-      "//testing/scripts/run_telemetry_as_googletest.py",
+    ]
+    data_deps = [
+      ":telemetry_as_gtest",
     ]
   }
 
@@ -2934,11 +2965,8 @@ group("telemetry_perf_unittests") {
     "//tools/perf:perf",
   ]
 
-  data = [
-    # For isolate contract.
-    "//testing/scripts/common.py",
-    "//testing/xvfb.py",
-    "//testing/scripts/run_telemetry_as_googletest.py",
+  data_deps = [
+    ":telemetry_as_gtest",
   ]
 }
 
@@ -2948,11 +2976,8 @@ group("telemetry_perf_tests") {
     "//tools/perf/:perf",
   ]
 
-  data = [
-    # Needed for isolate script to execute.
-    "//testing/scripts/common.py",
-    "//testing/xvfb.py",
-    "//testing/scripts/run_telemetry_benchmark_as_googletest.py",
+  data_deps = [
+    ":telemetry_benchmark_as_gtest",
   ]
 }