Revert "Enable media_perftests to run on Windows, Mac, and Linux."

tools/perf/generate_perf_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.perf.json and chromium.perf.fyi.json in
 the src/testing/buildbot directory. Maintaining these files by hand is
 too unwieldy.
 """
 
@@ skipping 226 matching lines @@
     ])
   waterfall = add_tester(
     waterfall, 'Win 10 Perf', 'chromium-rel-win10', 'win',
     swarming=[
       {
        'gpu': '102b:0534',
        'os': 'Windows-10-10240',
        'device_ids': [
            'build132-m1', 'build133-m1',
            'build134-m1', 'build135-m1', 'build136-m1'
-          ],
-       'perf_tests': [
-         ('media_perftests', 2)]
+          ]
       }
     ])
   waterfall = add_tester(
     waterfall, 'Win 8 Perf', 'chromium-rel-win8-dual', 'win',
     swarming=[
       {
        'gpu': '102b:0532',
        'os': 'Windows-2012ServerR2-SP0',
        'device_ids': [
            'build143-m1', 'build144-m1',
            'build145-m1', 'build146-m1', 'build147-m1'
           ],
        'perf_tests': [
          ('load_library_perf_tests', 2),
-         ('performance_browser_tests', 2),
-         ('media_perftests', 3)]
+         ('performance_browser_tests', 2)]
       }
     ])
   waterfall = add_tester(
     waterfall, 'Win 7 Perf', 'chromium-rel-win7-dual',
     'win', target_bits=32,
     swarming=[
       {
        'gpu': '102b:0532',
        'os': 'Windows-2008ServerR2-SP1',
        'device_ids': [
            'build185-m1', 'build186-m1',
            'build187-m1', 'build188-m1', 'build189-m1'
           ],
        'perf_tests': [
          ('load_library_perf_tests', 2),
-         ('performance_browser_tests', 2),
-         ('media_perftests', 3)]
+         ('performance_browser_tests', 2)]
       }
     ])
   waterfall = add_tester(
     waterfall, 'Win 7 x64 Perf',
     'chromium-rel-win7-x64-dual', 'win',
     swarming=[
       {
        'gpu': '102b:0532',
        'os': 'Windows-2008ServerR2-SP1',
        'device_ids': [
@@ skipping 12 matching lines @@
       {
        'gpu': '1002:6779',
        'os': 'Windows-2008ServerR2-SP1',
        'device_ids': [
            'build101-m1', 'build102-m1',
            'build103-m1', 'build104-m1', 'build105-m1'
           ],
        'perf_tests': [
          ('angle_perftests', 2),
          ('load_library_perf_tests', 2),
-         ('performance_browser_tests', 2),
-         ('media_perftests', 3)]
+         ('performance_browser_tests', 2)]
       }
     ])
   waterfall = add_tester(
     waterfall, 'Win 7 Intel GPU Perf',
     'chromium-rel-win7-gpu-intel', 'win',
     swarming=[
       {
        'gpu': '8086:041a',
        'os': 'Windows-2008ServerR2-SP1',
        'device_ids': [
            'build164-m1', 'build165-m1',
            'build166-m1', 'build167-m1', 'build168-m1'
           ]
       }
     ])
   waterfall = add_tester(
     waterfall, 'Win 7 Nvidia GPU Perf',
     'chromium-rel-win7-gpu-nvidia', 'win',
     swarming=[
       {
        'gpu': '10de:104a',
        'os': 'Windows-2008ServerR2-SP1',
        'device_ids': [
            'build92-m1', 'build93-m1',
            'build94-m1', 'build95-m1', 'build96-m1'
           ],
        'perf_tests': [
          ('angle_perftests', 2),
          ('load_library_perf_tests', 2),
-         ('performance_browser_tests', 2),
-         ('media_perftests', 3)]
+         ('performance_browser_tests', 2)]
       }
     ])
 
   waterfall = add_tester(
     waterfall, 'Mac 10.11 Perf', 'chromium-rel-mac11',
     'mac',
     swarming=[
       {
        'gpu': '8086:0166',
        'os': 'Mac-10.11',
        'device_ids': [
            'build102-b1', 'build103-b1',
            'build104-b1', 'build105-b1', 'build106-b1'
-          ],
-       'perf_tests': [
-         ('media_perftests', 2)]
+          ]
       }
     ])
   waterfall = add_tester(
     waterfall, 'Mac 10.10 Perf', 'chromium-rel-mac10',
     'mac',
     swarming=[
       {
        'os': 'Mac-10.10',
        'gpu': '8086:0a2e',
        'device_ids': [
@@ skipping 46 matching lines @@
       {
        'gpu': '102b:0534',
        'os': 'Ubuntu-14.04',
        'device_ids': [
            'build148-m1', 'build149-m1',
            'build150-m1', 'build151-m1', 'build152-m1'
           ],
        'perf_tests': [
          ('cc_perftests', 2),
          ('load_library_perf_tests', 2),
-         ('tracing_perftests', 2),
-         ('media_perftests', 3)]
+         ('tracing_perftests', 2)]
       }
     ])
 
   return waterfall
 
 
 def generate_isolate_script_entry(swarming_dimensions, test_args,
   isolate_name, step_name, override_compile_targets=None):
   result = {
     'args': test_args,
@@ skipping 306 matching lines @@
   waterfall['name'] = 'chromium.perf'
   fyi_waterfall = get_fyi_waterfall_config()
   fyi_waterfall['name'] = 'chromium.perf.fyi'
 
   generate_all_tests(fyi_waterfall)
   generate_all_tests(waterfall)
   return 0
 
 if __name__ == '__main__':
   sys.exit(main())