fyi: Remove buildrunner_tests from win_tests, switch chrome_elf_unittests to run without it.

masters/master.chromium.fyi/master.cfg

Index: masters/master.chromium.fyi/master.cfg
diff --git a/masters/master.chromium.fyi/master.cfg b/masters/master.chromium.fyi/master.cfg
index 927f5d177ecc729cefdefe6e97b3e5232a9d86ee..37170644413cc885036e62766e66ca8e644058cf 100644
--- a/masters/master.chromium.fyi/master.cfg
+++ b/masters/master.chromium.fyi/master.cfg
@@ -549,7 +549,7 @@ def without(these, notthese):
 
 tests_win_1 = ['base_unittests',
                'cacheinvalidation_unittests',
-               'chrome_elf_unittests_br',
+               'chrome_elf_unittests',
                'components_unittests',
                'courgette_unittests',
                'crypto_unittests',
@@ -568,7 +568,6 @@ tests_win_1 = ['base_unittests',
                'sandbox',
                'unit',
                'url_unittests',
-               'buildrunner_tests',
 ]
 tests_win_2 = ['browser_tests',
                'content_browsertests']
@@ -694,7 +693,7 @@ f_chromium_rel_linux_lsan_asan = linux().ChromiumFactory(
                             'lsan=1 '
                             'use_aura=1 '
                             'use_allocator=none '),
-            'GYP_GENERATORS': 'ninja', },
+            },
         'lsan': True,
         'sharded_tests': sharded_tests,
         'retry_failed': False,
@@ -716,7 +715,7 @@ f_chromium_windows_drmemory_builder = win_out().ChromiumFactory(
     factory_properties={
         'gclient_env': { 'GYP_DEFINES' : ('build_for_tool=drmemory '
                                           'component=shared_library'),
-                         'GYP_GENERATORS': 'ninja'},
+                       },
         'package_pdb_files': True,
         'trigger': 'chromium_windows_drmemory'})
 
@@ -827,7 +826,7 @@ f_chromium_win_clang = win_out().ChromiumFactory(
     slave_type='BuilderTester',
     target='Release',
     tests=win_clang_tests,
-    options=['--build-tool=ninja', '--', 'chromium_builder_tests'],
+    options=['chromium_builder_tests'],
     factory_properties={
       'gclient_env': {
         'GYP_DEFINES': 'clang=1',
@@ -837,7 +836,7 @@ f_chromium_win_clang_dbg = win_out().ChromiumFactory(
     slave_type='BuilderTester',
     target='Debug',
     tests=win_clang_tests,
-    options=['--build-tool=ninja', '--', 'chromium_builder_tests'],
+    options=['chromium_builder_tests'],
     factory_properties={
       'gclient_env': {
         'GYP_DEFINES': 'clang=1',
@@ -847,7 +846,7 @@ f_chromium_win_clang_shared = win_out().ChromiumFactory(
     slave_type='BuilderTester',
     target='Release',
     tests=win_clang_tests,
-    options=['--build-tool=ninja', '--', 'chromium_builder_tests'],
+    options=['chromium_builder_tests'],
     factory_properties={
       'gclient_env': {
         'GYP_DEFINES': 'clang=1 component=shared_library',
@@ -858,7 +857,7 @@ f_chromium_win_clang_asan = win_out().ChromiumFactory(
     target='Release',
     # ASan doesn't support sandboxing on Windows yet (http://crbug.com/382867).
     tests=without(win_clang_tests, ['sandbox']),
-    options=['--build-tool=ninja', '--', 'chromium_builder_tests'],
+    options=['chromium_builder_tests'],
     factory_properties={
       'asan': True,
       'gclient_env': {
@@ -868,7 +867,7 @@ f_chromium_win_clang_asan = win_out().ChromiumFactory(
 
 f_chromium_win_ninja_shared_2013_dbg = win_out().ChromiumFactory(
     slave_type='BuilderTester',
-    options=['--build-tool=ninja', 'chromium_builder_tests'],
+    options=['chromium_builder_tests'],
     tests=tests_win_1,
     target='Debug',
     factory_properties={
@@ -878,7 +877,7 @@ f_chromium_win_ninja_shared_2013_dbg = win_out().ChromiumFactory(
 
 f_chromium_win_ninja_shared_2013 = win_out().ChromiumFactory(
     slave_type='BuilderTester',
-    options=['--build-tool=ninja', 'chromium_builder_tests'],
+    options=['chromium_builder_tests'],
     tests=tests_win_1,
     target='Release',
     factory_properties={
@@ -889,7 +888,7 @@ f_chromium_win_ninja_shared_2013 = win_out().ChromiumFactory(
 f_chromium_win_ninja_goma_shared_2013_dbg = win_out().ChromiumFactory(
     slave_type='BuilderTester',
     options=[
-        '--build-tool=ninja', '--compiler=goma', '--',
+        '--compiler=goma', '--',
         'chromium_builder_tests'
     ],
     tests=tests_win_1 + ['diagnose_goma'],
@@ -906,7 +905,7 @@ f_chromium_win_ninja_goma_shared_2013_dbg = win_out().ChromiumFactory(
 f_chromium_win_ninja_goma_shared_2013 = win_out().ChromiumFactory(
     slave_type='BuilderTester',
     options=[
-        '--build-tool=ninja', '--compiler=goma', '--',
+        '--compiler=goma', '--',
         'chromium_builder_tests'
     ],
     tests=tests_win_1 + ['diagnose_goma'],
@@ -1117,7 +1116,6 @@ f_chromium_mac_ninja_goma_canary = mac().ChromiumFactory(
     clobber=True,
     target='Release',
     options=[
-      '--build-tool=ninja',
       '--compiler=goma-clang',
     ],
     factory_properties={