Update chromium_mac recipe for re-imaged testers.

scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_6_Tests.json

Index: scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_6_Tests.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_6_Tests__1_.json b/scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_6_Tests.json
similarity index 88%
rename from scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_6_Tests__1_.json
rename to scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_6_Tests.json
index 631e4dc792e1b474245bd33acbd00c19fa68154c..f7e970b8f2fdb13da10d1f1413c4cc70e66e78e9 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_6_Tests__1_.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_6_Tests.json
@@ -7,7 +7,7 @@
       "--master",
       "chromium.mac",
       "--builder",
-      "Mac10.6 Tests (1)",
+      "Mac10.6 Tests",
       "--slave",
       "TestSlavename",
       "--spec",
@@ -107,7 +107,7 @@
     "~followup_annotations": [
       "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.mac.json@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"Mac10.6 Tests (1)\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"Mac10.6 Tests\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"gtest_tests\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"swarming\": {@@@",
@@ -134,7 +134,7 @@
       "--paths",
       "{\"build\": \"[BUILD]\"}",
       "--properties",
-      "{\"buildername\": \"Mac10.6 Tests (1)\", \"buildnumber\": 571, \"slavename\": \"TestSlavename\"}"
+      "{\"buildername\": \"Mac10.6 Tests\", \"buildnumber\": 571, \"slavename\": \"TestSlavename\"}"
     ],
     "name": "get compile targets for scripts",
     "~followup_annotations": [
@@ -178,9 +178,9 @@
       "--build-archive-url",
       "gs://test-domain/test-archive.zip",
       "--factory-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Mac10.6 Tests (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.mac\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"browser_tests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Mac10.6 Tests\", \"buildnumber\": 571, \"mastername\": \"chromium.mac\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"browser_tests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--build-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Mac10.6 Tests (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.mac\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"browser_tests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"workdir\": \"/path/to/workdir/TestSlavename\"}"
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Mac10.6 Tests\", \"buildnumber\": 571, \"mastername\": \"chromium.mac\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"browser_tests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"workdir\": \"/path/to/workdir/TestSlavename\"}"
     ],
     "name": "extract build"
   },
@@ -199,7 +199,7 @@
       "--shards",
       "1",
       "--task-name",
-      "browser_tests/Mac-10.6/ffffffffff/Mac10.6 Tests (1)/571",
+      "browser_tests/Mac-10.6/ffffffffff/Mac10.6 Tests/571",
       "--dump-json",
       "/path/to/tmp/json",
       "--expiration",
@@ -221,7 +221,7 @@
       "pool",
       "Chrome",
       "--tag",
-      "buildername:Mac10.6 Tests (1)",
+      "buildername:Mac10.6 Tests",
       "--tag",
       "buildnumber:571",
       "--tag",
@@ -246,9 +246,9 @@
     "name": "[trigger] browser_tests on Mac-10.6",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"browser_tests/Mac-10.6/ffffffffff/Mac10.6 Tests (1)/571\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"browser_tests/Mac-10.6/ffffffffff/Mac10.6 Tests/571\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"browser_tests/Mac-10.6/ffffffffff/Mac10.6 Tests (1)/571\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"browser_tests/Mac-10.6/ffffffffff/Mac10.6 Tests/571\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
@@ -279,7 +279,7 @@
       "--print-status-updates",
       "--shards",
       "1",
-      "browser_tests/Mac-10.6/ffffffffff/Mac10.6 Tests (1)/571"
+      "browser_tests/Mac-10.6/ffffffffff/Mac10.6 Tests/571"
     ],
     "name": "browser_tests on Mac-10.6"
   }