Add telemetry_gpu_unittests.isolate.

This will make it easier to run this test suite on the bots.

Refactored Telemetry isolates into:

  - telemetry.isolate: contains just Telemetry's logic and
    dependencies (bitmaptools). Moved this from chrome/ into content/
    to match its dependencies.

  - telemetry_chrome_test.isolate: describes Telemetry tests which run
    using the Chromium browser. Currently telemetry_gpu_test.isolate
    is the only consumer of this isolate.

The new test target will be added to the bots in a subsequent commit;
some more work is needed to do so.

BUG=495868
R=zmo@chromium.org,phajdan.jr@chromium.org,maruel@google.com
TBR=maruel@chromium.org

Review URL: https://codereview.chromium.org/1212113003

Cr-Commit-Position: refs/heads/master@{#336392}

6 files changed, 76 insertions, 20 deletions

diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 700db89..fc6f020 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3189,10 +3189,10 @@
               },
             },
             {
-              'target_name': 'telemetry_isolate_base',
+              'target_name': 'telemetry_chrome_test_base',
               'type': 'none',
               'dependencies': [
-                '../tools/telemetry/telemetry.gyp:bitmaptools#host',
+                '../content/content_shell_and_tests.gyp:telemetry_base',
               ],
               'conditions': [
                 ['OS=="linux" or OS=="mac"', {
@@ -3246,7 +3246,7 @@
               'dependencies': [
                 'chrome_run',
                 'gpu_tests_base',
-                'telemetry_isolate_base',
+                'telemetry_chrome_test_base',
               ],
               'sources': [
                 'telemetry_gpu_test.isolate',
diff --git a/chrome/telemetry_chrome_test.isolate b/chrome/telemetry_chrome_test.isolate
new file mode 100644
index 0000000..a3c9f3a
--- /dev/null
+++ b/chrome/telemetry_chrome_test.isolate
@@ -0,0 +1,12 @@
+# Copyright (c) 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.
+{
+  # This isolate describes dependencies needed to run Telemetry tests
+  # that run in Chromium.
+  'includes': [
+    'breakpad.isolate',
+    'chrome.isolate',
+    '../content/telemetry.isolate',
+  ],
+}
diff --git a/chrome/telemetry_gpu_test.isolate b/chrome/telemetry_gpu_test.isolate
index 0a8a450..635c8f1 100644
--- a/chrome/telemetry_gpu_test.isolate
+++ b/chrome/telemetry_gpu_test.isolate
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 {
   'includes': [
-    'telemetry.isolate',
+    'telemetry_chrome_test.isolate',
   ],
   'conditions': [
     ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 652588d..9f8c26e 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -1228,6 +1228,26 @@
             }],
           ],
         },
+        {
+          'target_name': 'telemetry_base',
+          'type': 'none',
+          'dependencies': [
+            '../tools/telemetry/telemetry.gyp:bitmaptools#host',
+          ],
+        },
+        {
+          'target_name': 'telemetry_gpu_unittests_run',
+          'type': 'none',
+          'dependencies': [
+            'telemetry_base',
+          ],
+          'includes': [
+            '../build/isolate.gypi',
+          ],
+          'sources': [
+            'telemetry_gpu_unittests.isolate',
+          ],
+        },
       ],
       'conditions': [
         ['archive_gpu_tests==1', {
diff --git a/chrome/telemetry.isolate b/content/telemetry.isolate
index 776967e..85c5291 100644
--- a/chrome/telemetry.isolate
+++ b/content/telemetry.isolate
@@ -1,26 +1,22 @@
-# Copyright (c) 2013 The Chromium Authors. All rights reserved.
+# Copyright (c) 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.
 {
-  'includes': [
-    'breakpad.isolate',
-    'chrome.isolate',
-  ],
   'conditions': [
     ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
-      # This list comes from running:
-      #   tools/perf/run_benchmark --print-bootstrap-deps
-      # and filtering out obvious undesired dependencies:
-      #   'src/tools/perf/page_sets/'
-      #   'src/tools/perf/measurements/'
-      #   'src/tools/perf/metrics/'
-      #   'src/tools/perf/profile_creators/'
-      #   'src/tools/perf/benchmarks/'
-      #   'src/chrome/test/data/extensions/profiles/'
-      # Note that the dependency on ../build/android/ was made more
-      # precise to ../build/android/pylib/.
       'variables': {
         'files': [
+          # This list comes from running:
+          #   tools/perf/run_benchmark --print-bootstrap-deps
+          # and filtering out obvious undesired dependencies:
+          #   'src/tools/perf/page_sets/'
+          #   'src/tools/perf/measurements/'
+          #   'src/tools/perf/metrics/'
+          #   'src/tools/perf/profile_creators/'
+          #   'src/tools/perf/benchmarks/'
+          #   'src/chrome/test/data/extensions/profiles/'
+          # Note that the dependency on ../build/android/ was made more
+          # precise to ../build/android/pylib/.
           '../build/android/pylib/',
           '../build/util/',
           '../third_party/WebKit/PerformanceTests/resources/jquery.tablesorter.min.js',
@@ -29,6 +25,7 @@
           '../third_party/flot/jquery.flot.min.js',
           '../third_party/webpagereplay/',
           '../tools/telemetry/',
+          # For Telemetry's screenshot support.
           '<(PRODUCT_DIR)/bitmaptools<(EXECUTABLE_SUFFIX)',
         ],
       },
diff --git a/content/telemetry_gpu_unittests.isolate b/content/telemetry_gpu_unittests.isolate
new file mode 100644
index 0000000..f071d82
--- /dev/null
+++ b/content/telemetry_gpu_unittests.isolate
@@ -0,0 +1,27 @@
+# Copyright (c) 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.
+{
+  'includes': [
+    'telemetry.isolate',
+  ],
+  'conditions': [
+    ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
+      'variables': {
+        'files': [
+          # Other dependencies of the tests and their harness.
+          '../third_party/typ/',
+          '../third_party/trace-viewer/',
+          '../testing/test_env.py',
+          # The following represent the actual tests.
+          '../content/test/gpu/',
+        ],
+        'command': [
+          '../testing/test_env.py',
+          '../content/test/gpu/run_unittests.py',
+          '-v',
+        ],
+      },
+    }],
+  ]
+}