Rename PyAuto waterfall to ChromeDriver.

masters/master.chromium.chromedriver/master.cfg

Index: masters/master.chromium.chromedriver/master.cfg
diff --git a/masters/master.chromium.pyauto/master.cfg b/masters/master.chromium.chromedriver/master.cfg
similarity index 86%
rename from masters/master.chromium.pyauto/master.cfg
rename to masters/master.chromium.chromedriver/master.cfg
index 634020f93b34b5826fa171d5972a21459dd61010..cd8ddb2a0310e92623007c58704fd05244a13755 100644
--- a/masters/master.chromium.pyauto/master.cfg
+++ b/masters/master.chromium.chromedriver/master.cfg
@@ -14,7 +14,7 @@ from master.factory import chromium_factory
 
 import config
 
-ActiveMaster = config.Master.ChromiumPyauto
+ActiveMaster = config.Master.ChromiumChromeDriver
 
 # This is the dictionary that the buildmaster pays attention to. We also use
 # a shorter alias to save typing.
@@ -59,10 +59,10 @@ c['change_source'] = [trunk_poller]
 s_chromium = Scheduler(name='chromium',
                        branch='src',
                        treeStableTimer=60,
-                       builderNames=['Win7 QA',
-                                     'Mac 10.6 QA',
-                                     'Linux QA',
-                                     'Linux32 QA',
+                       builderNames=['Win7',
+                                     'Mac 10.6',
+                                     'Linux',
+                                     'Linux32',
                                     ])
 
 c['schedulers'] = [s_chromium]
@@ -87,7 +87,7 @@ f_linux = F_LINUX(target='Release',
                   options=['chromium_builder_chromedriver'],
                   tests=['annotated_steps'],
                   factory_properties={
-                    'annotated_script': 'qa_buildbot_run.py',
+                    'annotated_script': 'chromedriver_buildbot_run.py',
                     'use_xvfb_on_linux': True,
                     'needs_webdriver_java_tests': True,
                   })
@@ -97,7 +97,7 @@ f_win7 = F_WIN(slave_type='Builder',
                target='Release',
                tests=['annotated_steps'],
                factory_properties={
-                 'annotated_script': 'qa_buildbot_run.py',
+                 'annotated_script': 'chromedriver_buildbot_run.py',
                  'trigger': 'win_trigger',
                  'needs_webdriver_java_tests': True,
                })
@@ -108,7 +108,7 @@ f_mac_10_6 = F_MAC(slave_type='Builder',
                             '-target', 'chromium_builder_chromedriver'],
                    tests=['annotated_steps'],
                    factory_properties={
-                     'annotated_script': 'qa_buildbot_run.py',
+                     'annotated_script': 'chromedriver_buildbot_run.py',
                      'needs_webdriver_java_tests': True,
                    })
 
@@ -116,25 +116,25 @@ f_mac_10_6 = F_MAC(slave_type='Builder',
 # BUILDER DEFINITIONS
 
 b_win7 = {
-  'name': 'Win7 QA',
+  'name': 'Win7',
   'factory': f_win7,
-  'builddir': 'pyauto_win7',
+  'builddir': 'chromedriver_win7',
   'auto_reboot': False
 }
 b_linux = {
-  'name': 'Linux QA',
+  'name': 'Linux',
   'factory': f_linux,
   'auto_reboot': False
 }
 b_linux32 = {
-  'name': 'Linux32 QA',
+  'name': 'Linux32',
   'factory': f_linux,
   'auto_reboot': False
 }
 b_mac10_6 = {
-  'name': 'Mac 10.6 QA',
+  'name': 'Mac 10.6',
   'factory': f_mac_10_6,
-  'builddir': 'pyauto_mac_10_6',
+  'builddir': 'chromedriver_mac_10_6',
   'auto_reboot': False
 }
 
@@ -147,7 +147,7 @@ c['builders'] = [
 
 # Associate the slaves to the manual builders. The configuration is in
 # slaves.cfg.
-slaves = slaves_list.SlavesList('slaves.cfg', 'ChromiumPyauto')
+slaves = slaves_list.SlavesList('slaves.cfg', 'ChromiumChromeDriver')
 for builder in c['builders']:
   builder['slavenames'] = slaves.GetSlavesName(builder=builder['name'])
 
@@ -172,4 +172,4 @@ master_utils.AutoSetupMaster(c, ActiveMaster,
 ####### PROJECT IDENTITY
 
 # Buildbot master url:
-c['buildbotURL'] = 'http://build.chromium.org/buildbot/pyauto/'
+c['buildbotURL'] = 'http://build.chromium.org/buildbot/chromedriver/'