Revert of Rename existing Blink try bots to include OS version.

scripts/slave/recipes/chromium_trybot.expected/non_cq_blink_tryjob.json

Index: scripts/slave/recipes/chromium_trybot.expected/non_cq_blink_tryjob.json
diff --git a/scripts/slave/recipes/chromium_trybot.expected/non_cq_blink_tryjob.json b/scripts/slave/recipes/chromium_trybot.expected/non_cq_blink_tryjob.json
index e492d3ac90f5ba54fe37bf6841ffa0d17230d2e1..ca167630542462adbf5039e9df90cdfe9056368f 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/non_cq_blink_tryjob.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/non_cq_blink_tryjob.json
@@ -37,7 +37,7 @@
       "--master",
       "tryserver.blink",
       "--builder",
-      "win7_blink_rel",
+      "win_blink_rel",
       "--slave",
       "TestSlavename",
       "--spec",
@@ -236,7 +236,7 @@
       "--paths",
       "{\"checkout\": \"[BUILDER_CACHE]\\\\win_layout\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
       "--properties",
-      "{\"buildername\": \"win7_blink_rel\", \"buildnumber\": 571, \"mastername\": \"tryserver.blink\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
+      "{\"buildername\": \"win_blink_rel\", \"buildnumber\": 571, \"mastername\": \"tryserver.blink\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
     ],
     "name": "get compile targets for scripts",
     "~followup_annotations": [
@@ -356,7 +356,7 @@
       "-m",
       "tryserver.blink",
       "-b",
-      "win7_blink_rel",
+      "win_blink_rel",
       "--config-file",
       "[BUILDER_CACHE]\\win_layout\\src\\tools\\mb\\mb_config.pyl",
       "--goma-dir",
@@ -437,7 +437,7 @@
       "--build-number",
       "571",
       "--builder-name",
-      "win7_blink_rel",
+      "win_blink_rel",
       "--step-name",
       "webkit_tests (with patch)",
       "--master-name",
@@ -465,7 +465,7 @@
       "--build-number",
       "571",
       "--builder-name",
-      "win7_blink_rel",
+      "win_blink_rel",
       "--gs-bucket",
       "gs://chromium-layout-test-archives",
       "--staging-dir",
@@ -477,8 +477,8 @@
     },
     "name": "archive_webkit_tests_results",
     "~followup_annotations": [
-      "@@@STEP_LINK@layout_test_results@https://storage.googleapis.com/chromium-layout-test-archives/win7_blink_rel/571/layout-test-results/results.html@@@",
-      "@@@STEP_LINK@(zip)@https://storage.googleapis.com/chromium-layout-test-archives/win7_blink_rel/571/layout-test-results.zip@@@"
+      "@@@STEP_LINK@layout_test_results@https://storage.googleapis.com/chromium-layout-test-archives/win_blink_rel/571/layout-test-results/results.html@@@",
+      "@@@STEP_LINK@(zip)@https://storage.googleapis.com/chromium-layout-test-archives/win_blink_rel/571/layout-test-results.zip@@@"
     ]
   },
   {