Temporarily mark Maps.maps_004 flaky on Mac and Win.

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 1033 matching lines @@
       '--build-revision',
       '${got_revision}',
       '--test-machine-name',
       '${buildername}',
     ],
     'tester_configs': [
       {
         'allow_on_android': True,
       },
     ],
-    'disabled_tester_configs': [
-      {
-        'names': [
-          # TODO(crbug.com/626986) Flaky on Mac and Win.
-          'Mac 10.10 Debug (Intel)',
-          'Win7 Release (NVIDIA)',
-        ],
-      },
-    ],
   },
   'screenshot_sync': {
     'tester_configs': [
       {
         'allow_on_android': True,
       },
     ],
   },
   'trace_test': {
     'tester_configs': [
@@ skipping 441 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())