Break config_default into master_site_configs.

test/masters_test.py

Index: test/masters_test.py
diff --git a/test/masters_test.py b/test/masters_test.py
index 2b3996a824b5d3a043e45eacbb136e3f23d61984..22de3f65b8bdbe6788f1b1290c2feac454ebb90e 100755
--- a/test/masters_test.py
+++ b/test/masters_test.py
@@ -223,14 +223,12 @@ def main():
       'master.chromium.perf_av': 'ChromiumPerfAv',
       'master.chromium.pyauto': 'ChromiumPyauto',
       'master.chromium.swarm': 'ChromiumSwarm',
-      'master.chromium.unused': None,
       'master.chromium.webkit': 'ChromiumWebkit',
       'master.chromium.webrtc': 'ChromiumWebRTC',
       'master.chromium.webrtc.fyi': 'ChromiumWebRTCFYI',
       'master.chromium.win': 'ChromiumWin',
       'master.chromiumos': 'ChromiumOS',
-      'master.chromiumos.tryserver': None,
-      'master.chromiumos.unused': None,
+      'master.chromiumos.tryserver': 'ChromiumOSTryServer',
       'master.client.drmemory': 'DrMemory',
       'master.client.dynamorio': 'DynamoRIO',
       'master.client.dart': 'Dart',
@@ -248,23 +246,25 @@ def main():
       'master.client.nacl.toolchain': 'NativeClientToolchain',
       'master.client.omaha': 'Omaha',
       'master.client.pagespeed': 'PageSpeed',
-      'master.client.sfntly': None,
-      'master.client.skia': None,
-      'master.client.syzygy': None,
-      'master.client.toolkit': None,
-      'master.client.tsan': None,  # make start fails
-      'master.client.unused': None,
+      'master.client.sfntly': 'Sfntly',
+      'master.client.skia': None,  # buildbot files live in Skia repo
+      'master.client.syzygy': 'Syzygy',
+      'master.client.toolkit': 'Toolkit',
+      'master.client.tsan': None,  # buildbot files live in TSan repo
       'master.client.v8': 'V8',
       'master.client.webrtc': 'WebRTC',
-      'master.experimental': None,
-      'master.reserved': None,  # make start fails
+      'master.experimental': 'Experimental',
       'master.tryserver.chromium': 'TryServer',
       'master.tryserver.chromium.linux': 'TryServerLinux',
       'master.tryserver.nacl': 'NativeClientTryServer',
-      'master.tryserver.unused': None,
       'master.tryserver.webrtc': 'WebRTCTryServer',
       'master.tryserver.libyuv': 'LibyuvTryServer',
       'master.devtools': 'DevTools',
+      'master.chromium.unused': None,
+      'master.chromiumos.unused': None,
+      'master.client.unused': None,
+      'master.tryserver.unused': None,
+      'master.reserved': None,
   }
   return real_main(base_dir, expected)