Revert of Extend chromium_tests trigger to work across masters.

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

Index: scripts/slave/recipes/chromium.expected/full_chromium_android_Android_arm_Builder__dbg_.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_arm_Builder__dbg_.json b/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_arm_Builder__dbg_.json
index e03e6c9597912a49ab236cb541f2fb7892a3f27f..684e91c4452738e57825e85f80cc6723a93c0fe5 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_arm_Builder__dbg_.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_arm_Builder__dbg_.json
@@ -343,7 +343,6 @@
     "name": "trigger",
     "trigger_specs": [
       {
-        "bucket": "master.chromium.android",
         "builder_name": "Android WebView CTS L-MR1 (dbg)",
         "properties": {
           "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
@@ -359,9 +358,17 @@
           "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
           "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}"
         }
-      },
-      {
-        "bucket": "master.chromium.android",
+      }
+    ],
+    "~followup_annotations": [
+      "@@@STEP_TEXT@Android WebView CTS L-MR1 (dbg)@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "trigger (2)",
+    "trigger_specs": [
+      {
         "builder_name": "Android Webview L (dbg)",
         "properties": {
           "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
@@ -377,9 +384,17 @@
           "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
           "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}"
         }
-      },
-      {
-        "bucket": "master.chromium.android",
+      }
+    ],
+    "~followup_annotations": [
+      "@@@STEP_TEXT@Android Webview L (dbg)@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "trigger (3)",
+    "trigger_specs": [
+      {
         "builder_name": "Android Webview M (dbg)",
         "properties": {
           "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
@@ -395,9 +410,17 @@
           "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
           "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}"
         }
-      },
-      {
-        "bucket": "master.chromium.android",
+      }
+    ],
+    "~followup_annotations": [
+      "@@@STEP_TEXT@Android Webview M (dbg)@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "trigger (4)",
+    "trigger_specs": [
+      {
         "builder_name": "Jelly Bean Tester",
         "properties": {
           "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
@@ -413,9 +436,17 @@
           "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
           "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}"
         }
-      },
-      {
-        "bucket": "master.chromium.android",
+      }
+    ],
+    "~followup_annotations": [
+      "@@@STEP_TEXT@Jelly Bean Tester@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "trigger (5)",
+    "trigger_specs": [
+      {
         "builder_name": "KitKat Tablet Tester",
         "properties": {
           "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
@@ -431,9 +462,17 @@
           "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
           "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}"
         }
-      },
-      {
-        "bucket": "master.chromium.android",
+      }
+    ],
+    "~followup_annotations": [
+      "@@@STEP_TEXT@KitKat Tablet Tester@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "trigger (6)",
+    "trigger_specs": [
+      {
         "builder_name": "Lollipop Low-end Tester",
         "properties": {
           "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
@@ -449,9 +488,17 @@
           "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
           "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}"
         }
-      },
-      {
-        "bucket": "master.chromium.android",
+      }
+    ],
+    "~followup_annotations": [
+      "@@@STEP_TEXT@Lollipop Low-end Tester@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "trigger (7)",
+    "trigger_specs": [
+      {
         "builder_name": "Lollipop Phone Tester",
         "properties": {
           "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
@@ -467,9 +514,17 @@
           "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
           "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}"
         }
-      },
-      {
-        "bucket": "master.chromium.android",
+      }
+    ],
+    "~followup_annotations": [
+      "@@@STEP_TEXT@Lollipop Phone Tester@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "trigger (8)",
+    "trigger_specs": [
+      {
         "builder_name": "Lollipop Tablet Tester",
         "properties": {
           "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
@@ -485,9 +540,17 @@
           "parent_got_webrtc_revision": "0f90628433546e61d9268596da93418c623137f4",
           "parent_got_webrtc_revision_cp": "refs/heads/master@{#120644}"
         }
-      },
-      {
-        "bucket": "master.chromium.android",
+      }
+    ],
+    "~followup_annotations": [
+      "@@@STEP_TEXT@Lollipop Tablet Tester@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "trigger (9)",
+    "trigger_specs": [
+      {
         "builder_name": "Marshmallow Tablet Tester",
         "properties": {
           "parent_got_angle_revision": "fac9503c46405f77757b9a728eb85b8d7bc6080c",
@@ -506,7 +569,7 @@
       }
     ],
     "~followup_annotations": [
-      "@@@STEP_TEXT@Android WebView CTS L-MR1 (dbg)<br />Android Webview L (dbg)<br />Android Webview M (dbg)<br />Jelly Bean Tester<br />KitKat Tablet Tester<br />Lollipop Low-end Tester<br />Lollipop Phone Tester<br />Lollipop Tablet Tester<br />Marshmallow Tablet Tester@@@"
+      "@@@STEP_TEXT@Marshmallow Tablet Tester@@@"
     ]
   },
   {