telemetry: Create telemetry_gtest_wrapper build group.

chrome/test/BUILD.gn

 # Copyright 2014 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/chrome_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//chrome/common/features.gni")
@@ skipping 229 matching lines @@
   }
 
   if (enable_extensions) {
     public_deps += [
       "//chrome/common/extensions/api",
       "//extensions: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") {
   testonly = true
   deps = [
     ":telemetry_gpu_test",
   ]
 }
 
 group("telemetry_gpu_test") {
   testonly = true
   deps = [
     "//tools/perf/chrome_telemetry_build:telemetry_chrome_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/",
 
     # For GpuProcess.video
     "//content/test/data/media/bear.ogv",
 
     # For webgl_conformance
     "//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.
 # The _run targets exist only for compatibility w/ GYP.
 group("telemetry_gpu_integration_test_run") {
   testonly = true
   deps = [
     ":telemetry_gpu_integration_test",
   ]
 }
@@ skipping 796 matching lines @@
     deps = [
       ":telemetry_unittests",
     ]
   }
 
   group("telemetry_unittests") {
     testonly = true
     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",
     ]
   }
 
   group("telemetry_gpu_unittests_run") {
     testonly = true
     deps = [
       ":telemetry_gpu_unittests",
     ]
   }
 
   group("telemetry_gpu_unittests") {
+    testonly = true
     deps = [
       "//third_party/catapult/telemetry:telemetry_test_support",
     ]
     data = [
       # TODO(kbr): refactor the telemetry dependencies more cleanly.
       "//content/test/gpu/",
       "//content/test/data/gpu/",
 
       # For GpuProcess.video
       "//content/test/data/media/bear.ogv",
 
       # For webgl_conformance_expectations_unittest
       "//third_party/webgl/src/sdk/tests/",
 
       # For resolve the imports in content/test/gpu/run_gpu_test.py
       "//tools/perf/chrome_telemetry_build/",
 
       # 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",
     ]
   }
 
   # TODO(GYP_GONE): Delete this after we've converted everything to GN.
   # The _run targets exist only for compatibility w/ GYP.
   group("tab_capture_end2end_tests_run") {
     testonly = true
     deps = [
       ":browser_tests",
     ]
@@ skipping 1778 matching lines @@
     ":telemetry_perf_unittests",
   ]
 }
 
 group("telemetry_perf_unittests") {
   testonly = true
   deps = [
     "//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",
   ]
 }
 
 group("telemetry_perf_tests") {
   testonly = true
   deps = [
     "//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",
   ]
 }
 
 js2gtest("unit_tests_js") {
   test_type = "unit"
   sources = [
     "../browser/resources/google_now/background_unittest.gtestjs",
     "../browser/resources/google_now/cards_unittest.gtestjs",
     "../browser/resources/google_now/utility_unittest.gtestjs",
     "../browser/resources/md_downloads/action_service_unittest.gtestjs",
@@ skipping 2072 matching lines @@
       "touch_hud",
       "ui",
     ]
 
     if (is_linux && !is_android) {
       deps += [ "//components/font_service:manifest" ]
       packaged_services += [ "font_service" ]
     }
   }
 }