Ported pixel_test to new gpu_integration_test harness.

content/test/gpu/generate_buildbot_json.py

 #!/usr/bin/env python
 # Copyright 2016 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.
 
 """Script to generate chromium.gpu.json and chromium.gpu.fyi.json in
 the src/testing/buildbot directory. Maintaining these files by hand is
 too unwieldy.
 """
 
@@ skipping 947 matching lines @@
       '${got_revision}',
       '--test-machine-name',
       '${buildername}',
     ],
     'tester_configs': [
       {
         'allow_on_android': True,
       },
     ],
   },
-  'pixel_test': {
-    'target_name': 'pixel',
-    'args': [
-      '--refimg-cloud-storage-bucket',
-      'chromium-gpu-archive/reference-images',
-      '--os-type',
-      '${os_type}',
-      '--build-revision',
-      '${got_revision}',
-      '--test-machine-name',
-      '${buildername}',
-    ],
-    'non_precommit_args': [
-      '--upload-refimg-to-cloud-storage',
-    ],
-    'precommit_args': [
-      '--download-refimg-from-cloud-storage',
-    ],
-    'tester_configs': [
-      {
-        'allow_on_android': True,
-      },
-    ],
-  },
   'screenshot_sync': {
     'tester_configs': [
       {
         'allow_on_android': True,
       },
     ],
   },
   'trace_test': {
     'tester_configs': [
       {
         'allow_on_android': True,
       },
     ],
   },
 }
 
 # These tests use Telemetry's new, simpler, browser_test_runner.
 # Eventually all of the Telemetry based tests above will be ported to
 # this harness, and the old harness will be deleted.
 TELEMETRY_GPU_INTEGRATION_TESTS = {
   'context_lost': {
     'tester_configs': [
       {
         'allow_on_android': True,
       },
     ]
   },
+  'pixel_test': {
+    'target_name': 'pixel',
+    'args': [
+      '--refimg-cloud-storage-bucket',
+      'chromium-gpu-archive/reference-images',
+      '--os-type',
+      '${os_type}',
+      '--build-revision',
+      '${got_revision}',
+      '--test-machine-name',
+      '${buildername}',
+    ],
+    'non_precommit_args': [
+      '--upload-refimg-to-cloud-storage',
+    ],
+    'precommit_args': [
+      '--download-refimg-from-cloud-storage',
+    ],
+    'tester_configs': [
+      {
+        'allow_on_android': True,
+      },
+    ],
+  },
   'webgl_conformance': {
     'tester_configs': [
       {
         'allow_on_android': True,
       },
     ],
   },
   'webgl_conformance_d3d9_tests': {
     'tester_configs': [
       {
@@ skipping 378 matching lines @@
     json.dump(tests, fp, indent=2, separators=(',', ': '), sort_keys=True)
     fp.write('\n')
 
 def main():
   generate_all_tests(FYI_WATERFALL, True)
   generate_all_tests(WATERFALL, False)
   return 0
 
 if __name__ == "__main__":
   sys.exit(main())