Fix new linux-blink-heap-incremental-marking bot name.

Now following bit.ly/chromium-build-naming

TBR=martiniss@chromium.org

Bug: 812533
Change-Id: I923f3cefe256bbfb427e76ef0552e44e468167dd
Reviewed-on: https://chromium-review.googlesource.com/935661Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#538975}

testing/buildbot/chromium.fyi.json

@@ -314,25 +314,6 @@
       }
     ]
   },
-  "Blink Heap Incremental Markup": {
-    "isolated_scripts": [
-      {
-        "isolate_name": "webkit_layout_tests_exparchive",
-        "merge": {
-          "args": [
-            "--verbose"
-          ],
-          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
-        },
-        "name": "webkit_layout_tests",
-        "results_handler": "layout tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "shards": 6
-        }
-      }
-    ]
-  },
   "CFI Linux (icall)": {
     "gtest_tests": [
       {
@@ -8929,6 +8910,25 @@
       "chromiumos_preflight"
     ]
   },
+  "linux-blink-heap-incremental-marking": {
+    "isolated_scripts": [
+      {
+        "isolate_name": "webkit_layout_tests_exparchive",
+        "merge": {
+          "args": [
+            "--verbose"
+          ],
+          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
+        },
+        "name": "webkit_layout_tests",
+        "results_handler": "layout tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "shards": 6
+        }
+      }
+    ]
+  },
   "linux-gcc-rel": {
     "additional_compile_targets": [
       "empty_main"

testing/buildbot/waterfalls.pyl

@@ -907,11 +907,6 @@
         'os_type': 'android',
         'skip_output_links': True,
       },
-      'Blink Heap Incremental Markup': {
-        'test_suites': {
-          'isolated_scripts': 'chromium_webkit_isolated_scripts',
-        },
-      },
       'CFI Linux (icall)': {
         'test_suites': {
           'gtest_tests': 'chromium_linux_clang_and_gl_gtests',
@@ -1060,6 +1055,11 @@
           'gtest_tests': 'linux_arm_gtests',
         },
       },
+      'linux-blink-heap-incremental-marking': {
+        'test_suites': {
+          'isolated_scripts': 'chromium_webkit_isolated_scripts',
+        },
+      },
       'Linux Builder Goma Canary': {
         'additional_compile_targets': [
           'all',

tools/mb/mb_config.pyl

@@ -207,8 +207,6 @@
       'Win Goma Canary LocalOutputCache': 'release_bot_x86_minimal_symbols',
       'WinMSVC64 Goma Canary': 'win_msvc_release_bot',
 
-      'Blink Heap Incremental Marking': 'debug_bot_enable_blink_heap_incremental_marking',
-
       'EarlGreyiOS': 'ios',
       'Fuchsia (dbg)': 'debug_bot_fuchsia',
       'Fuchsia ARM64': 'release_bot_fuchsia_arm64',
@@ -235,6 +233,7 @@
       'Linux ARM (dbg)': 'debug_bot_arm',
       'Linux ARM64': 'release_bot_arm64',
       'Linux ARM64 (dbg)': 'debug_bot_arm64',
+      'linux-blink-heap-incremental-marking': 'debug_bot_enable_blink_heap_incremental_marking',
       'Linux Clang Analyzer': 'linux_chromium_analysis',
       'Linux deterministic': 'release_bot',
       'Linux deterministic (dbg)': 'debug_bot',