CrOS: Rename chromiumos.chromium builders.

masters/master.chromiumos.chromium/master_asan_cfg.py

Index: masters/master.chromiumos.chromium/master_asan_cfg.py
diff --git a/masters/master.chromiumos.chromium/master_asan_cfg.py b/masters/master.chromiumos.chromium/master_asan_cfg.py
index 4bfde3fc6012b9725d48b29622a9d66aaa135287..7167f6a32b6dfda23f1b9dcd433f6cbc943f4cda 100644
--- a/masters/master.chromiumos.chromium/master_asan_cfg.py
+++ b/masters/master.chromiumos.chromium/master_asan_cfg.py
@@ -17,23 +17,23 @@ defaults['category'] = '4chromeos asan'
 _ASAN_SCHEDULER_NAME = 'chromium_src_asan'
 helper.Scheduler(_ASAN_SCHEDULER_NAME, branch='master', treeStableTimer=60)
 
-def Builder(dname, sname, flavor, root, board):
-  fname = '%s-%s' % (sname, flavor)
-  B('%s (%s) Asan' % (dname, sname),
-    factory=fname,
+def Builder(board, root):
+  config = '%s-tot-asan-informational' % (board,)
+  B(config,
+    factory=config,
     gatekeeper='crosasantest',
-    builddir='%s-tot-chromeos-%s-asan' % (flavor, board),
+    builddir=config,
     scheduler=_ASAN_SCHEDULER_NAME,
     notify_on_missing=True)
-  F(fname,
+  F(config,
     chromeos_factory.CbuildbotFactory(
       buildroot='/b/cbuild/%s' % root,
       pass_revision=True,
-      params='%s-tot-asan-informational' % board).get_factory())
+      params=config).get_factory())
 
 
-Builder('Chromium OS', 'x86', 'chromium', 'shared_external', 'x86-generic')
-Builder('Chromium OS', 'amd64', 'chromium', 'shared_external', 'amd64-generic')
+Builder('x86-generic', 'shared_external')
+Builder('amd64-generic', 'shared_external')
 
 def Update(_config, _active_master, c):
   return helper.Update(c)