Change Builder Names, MkIII

tools/tests/factory_configuration/expected/Build-Ubuntu12-GCC-NaCl-Release-Trybot

Index: tools/tests/factory_configuration/expected/Build-Ubuntu12-GCC-NaCl-Release-Trybot
===================================================================
--- tools/tests/factory_configuration/expected/Build-Ubuntu12-GCC-NaCl-Release-Trybot	(revision 8881)
+++ tools/tests/factory_configuration/expected/Build-Ubuntu12-GCC-NaCl-Release-Trybot	(working copy)
@@ -2,7 +2,7 @@
     'TargetPathJoin': <Object>,
     '_autogen_svn_password_file': '.autogen_svn_password',
     '_autogen_svn_username_file': '.autogen_svn_username',
-    '_builder_name': 'Skia_Shuttle_Ubuntu12_NaCl_Compile_Release_Trybot',
+    '_builder_name': 'Build-Ubuntu12-GCC-NaCl-Release-Trybot',
     '_common_args': [
         '--autogen_svn_baseurl',
         'https://skia-autogen.googlecode.com/svn',
@@ -13,7 +13,7 @@
         '--gm_image_subdir',
         'None',
         '--builder_name',
-        'Skia_Shuttle_Ubuntu12_NaCl_Compile_Release_Trybot',
+        'Build-Ubuntu12-GCC-NaCl-Release-Trybot',
         '--target_platform',
         'linux',
         '--revision',
@@ -88,7 +88,7 @@
                     '--gm_image_subdir',
                     'None',
                     '--builder_name',
-                    'Skia_Shuttle_Ubuntu12_NaCl_Compile_Release_Trybot',
+                    'Build-Ubuntu12-GCC-NaCl-Release-Trybot',
                     '--target_platform',
                     'linux',
                     '--revision',
@@ -142,7 +142,7 @@
                     '--gm_image_subdir',
                     'None',
                     '--builder_name',
-                    'Skia_Shuttle_Ubuntu12_NaCl_Compile_Release_Trybot',
+                    'Build-Ubuntu12-GCC-NaCl-Release-Trybot',
                     '--target_platform',
                     'linux',
                     '--revision',
@@ -200,7 +200,7 @@
                     '--gm_image_subdir',
                     'None',
                     '--builder_name',
-                    'Skia_Shuttle_Ubuntu12_NaCl_Compile_Release_Trybot',
+                    'Build-Ubuntu12-GCC-NaCl-Release-Trybot',
                     '--target_platform',
                     'linux',
                     '--revision',
@@ -260,7 +260,7 @@
                     '--gm_image_subdir',
                     'None',
                     '--builder_name',
-                    'Skia_Shuttle_Ubuntu12_NaCl_Compile_Release_Trybot',
+                    'Build-Ubuntu12-GCC-NaCl-Release-Trybot',
                     '--target_platform',
                     'linux',
                     '--revision',
@@ -320,7 +320,7 @@
                     '--gm_image_subdir',
                     'None',
                     '--builder_name',
-                    'Skia_Shuttle_Ubuntu12_NaCl_Compile_Release_Trybot',
+                    'Build-Ubuntu12-GCC-NaCl-Release-Trybot',
                     '--target_platform',
                     'linux',
                     '--revision',
@@ -382,7 +382,7 @@
                     '--gm_image_subdir',
                     'None',
                     '--builder_name',
-                    'Skia_Shuttle_Ubuntu12_NaCl_Compile_Release_Trybot',
+                    'Build-Ubuntu12-GCC-NaCl-Release-Trybot',
                     '--target_platform',
                     'linux',
                     '--revision',
@@ -446,7 +446,7 @@
                     '--gm_image_subdir',
                     'None',
                     '--builder_name',
-                    'Skia_Shuttle_Ubuntu12_NaCl_Compile_Release_Trybot',
+                    'Build-Ubuntu12-GCC-NaCl-Release-Trybot',
                     '--target_platform',
                     'linux',
                     '--revision',