diff --git a/third_party/WebKit/LayoutTests/ASANExpectations b/third_party/WebKit/LayoutTests/ASANExpectations
index 695985ffd9cb88..edc89bf60fa6de 100644
--- a/third_party/WebKit/LayoutTests/ASANExpectations
+++ b/third_party/WebKit/LayoutTests/ASANExpectations
@@ -48,10 +48,10 @@ crbug.com/438499 [ Linux ] fast/workers/simultaneous-errors.html [ Timeout ]
 crbug.com/438499 [ Linux ] fast/workers/worker-multi-startup.html [ Timeout ]
 crbug.com/438499 [ Linux ] http/tests/websocket/workers/worker-simple.html [ Timeout ]
 crbug.com/438499 [ Linux ] http/tests/workers/text-encoding.html [ Timeout ]
-crbug.com/438499 [ Linux ] http/tests/devtools/profiler/heap-snapshot-loader.html [ Timeout ]
-crbug.com/667560 [ Linux ] virtual/mojo-loading/http/tests/devtools/profiler/heap-snapshot-loader.html [ Timeout ]
-crbug.com/438499 [ Linux ] http/tests/devtools/profiler/heap-snapshot-containment-show-all.html [ Timeout ]
-crbug.com/667560 [ Linux ] virtual/mojo-loading/http/tests/devtools/profiler/heap-snapshot-containment-show-all.html [ Timeout ]
+crbug.com/438499 [ Linux ] http/tests/devtools/profiler/heap-snapshot-loader.js [ Timeout ]
+crbug.com/667560 [ Linux ] virtual/mojo-loading/http/tests/devtools/profiler/heap-snapshot-loader.js [ Timeout ]
+crbug.com/438499 [ Linux ] http/tests/devtools/profiler/heap-snapshot-containment-show-all.js [ Timeout ]
+crbug.com/667560 [ Linux ] virtual/mojo-loading/http/tests/devtools/profiler/heap-snapshot-containment-show-all.js [ Timeout ]
 crbug.com/438499 [ Linux ] virtual/threaded/animations/unanimated-style.html [ Timeout ]
 
 # Flakily timeout on Linux ASAN bots.
diff --git a/third_party/WebKit/LayoutTests/SlowTests b/third_party/WebKit/LayoutTests/SlowTests
index 60ce0f5e18d63b..2797188b4eb5a0 100644
--- a/third_party/WebKit/LayoutTests/SlowTests
+++ b/third_party/WebKit/LayoutTests/SlowTests
@@ -262,10 +262,10 @@ crbug.com/357427 http/tests/workers/terminate-during-sync-operation-filesystem.h
 crbug.com/357427 virtual/mojo-loading/http/tests/workers/terminate-during-sync-operation-filesystem.html [ Slow ]
 crbug.com/402379 [ Debug ] storage/indexeddb/cursor-continue-validity.html [ Slow ]
 crbug.com/402379 [ Debug ] storage/indexeddb/mozilla/indexes.html [ Slow ]
-crbug.com/504706 [ Linux ] http/tests/devtools/profiler/heap-snapshot-containment-expansion-preserved-when-sorting.html [ Slow ]
-crbug.com/667560 [ Linux ] virtual/mojo-loading/http/tests/devtools/profiler/heap-snapshot-containment-expansion-preserved-when-sorting.html [ Slow ]
-crbug.com/504706 [ Linux ] http/tests/devtools/profiler/heap-snapshot-containment-sorting.html [ Slow ]
-crbug.com/667560 [ Linux ] virtual/mojo-loading/http/tests/devtools/profiler/heap-snapshot-containment-sorting.html [ Slow ]
+crbug.com/504706 [ Linux ] http/tests/devtools/profiler/heap-snapshot-containment-expansion-preserved-when-sorting.js [ Slow ]
+crbug.com/667560 [ Linux ] virtual/mojo-loading/http/tests/devtools/profiler/heap-snapshot-containment-expansion-preserved-when-sorting.js [ Slow ]
+crbug.com/504706 [ Linux ] http/tests/devtools/profiler/heap-snapshot-containment-sorting.js [ Slow ]
+crbug.com/667560 [ Linux ] virtual/mojo-loading/http/tests/devtools/profiler/heap-snapshot-containment-sorting.js [ Slow ]
 crbug.com/440452 virtual/display_list_2d_canvas/fast/canvas/canvas-partial-invalidation-zoomed.html [ Slow ]
 crbug.com/480769 http/tests/devtools/service-workers/service-workers-redundant.html [ Slow ]
 crbug.com/480769 virtual/mojo-loading/http/tests/devtools/service-workers/service-workers-redundant.html [ Slow ]
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations
index c7684a9c6e8857..56987ff6598c0e 100644
--- a/third_party/WebKit/LayoutTests/TestExpectations
+++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -1151,10 +1151,10 @@ crbug.com/528062 [ Win ] virtual/mojo-loading/http/tests/security/xssAuditor/chu
 # Part of a larger issue referenced in the bug. This specific issue will be fixed shortly.
 crbug.com/408159 accessibility/is-ignored-change-sends-notification.html [ Timeout ]
 
-crbug.com/504706 [ Linux ] http/tests/devtools/profiler/heap-snapshot-containment-expansion-preserved-when-sorting.html [ Pass ]
-crbug.com/667560 [ Linux ] virtual/mojo-loading/http/tests/devtools/profiler/heap-snapshot-containment-expansion-preserved-when-sorting.html [ Pass ]
-crbug.com/504706 [ Linux ] http/tests/devtools/profiler/heap-snapshot-containment-sorting.html [ Pass ]
-crbug.com/667560 [ Linux ] virtual/mojo-loading/http/tests/devtools/profiler/heap-snapshot-containment-sorting.html [ Pass ]
+crbug.com/504706 [ Linux ] http/tests/devtools/profiler/heap-snapshot-containment-expansion-preserved-when-sorting.js [ Pass ]
+crbug.com/667560 [ Linux ] virtual/mojo-loading/http/tests/devtools/profiler/heap-snapshot-containment-expansion-preserved-when-sorting.js [ Pass ]
+crbug.com/504706 [ Linux ] http/tests/devtools/profiler/heap-snapshot-containment-sorting.js [ Pass ]
+crbug.com/667560 [ Linux ] virtual/mojo-loading/http/tests/devtools/profiler/heap-snapshot-containment-sorting.js [ Pass ]
 
 # When drawing subpixel smoothed glyphs, CoreGraphics will fake bold the glyphs.
 # In this configuration, the pixel smoothed glyphs will be created from subpixel smoothed glyphs.
@@ -3539,8 +3539,8 @@ crbug.com/669329 virtual/threaded/http/tests/devtools/tracing/timeline-js/timeli
 crbug.com/667560 virtual/mojo-loading/http/tests/devtools/tracing/timeline-js/timeline-runtime-stats.html [ Pass Failure Crash ]
 
 # Tests timing out on WebKit Linux Trusty MSAN
-crbug.com/760543 [ Linux Release ] http/tests/devtools/profiler/heap-snapshot-inspect-dom-wrapper.html [ Pass Timeout ]
-crbug.com/760543 [ Linux Release ] virtual/mojo-loading/http/tests/devtools/profiler/heap-snapshot-inspect-dom-wrapper.html [ Pass Timeout ]
+crbug.com/760543 [ Linux Release ] http/tests/devtools/profiler/heap-snapshot-inspect-dom-wrapper.js [ Pass Timeout ]
+crbug.com/760543 [ Linux Release ] virtual/mojo-loading/http/tests/devtools/profiler/heap-snapshot-inspect-dom-wrapper.js [ Pass Timeout ]
 crbug.com/760543 [ Linux Release ] http/tests/devtools/tracing/console-timeline.html [ Pass Timeout ]
 crbug.com/760543 [ Linux Release ] virtual/mojo-loading/http/tests/devtools/tracing/console-timeline.html [ Pass Timeout ]
 crbug.com/760543 [ Linux Release ] http/tests/devtools/tracing/timeline-layout/timeline-layout-with-invalidations.html [ Pass Timeout ]
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/agents-disabled-check.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/agents-disabled-check.js
similarity index 75%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/agents-disabled-check.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/agents-disabled-check.js
index 662ab5796e5527..0ee5eb2f106d8b 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/agents-disabled-check.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/agents-disabled-check.js
@@ -1,9 +1,10 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(`Test that if a profiler is working all the agents are disabled.\n`);
 
-async function test() {
   var messages = [];
   function collectMessages(message) {
     messages.push(message);
@@ -26,15 +27,4 @@
     TestRunner.addResult(message);
   }
   TestRunner.completeTest();
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-
-<body onload="runTest()">
-<p>
-Test that if a profiler is working all the agents are disabled.
-</p>
-
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-agent-crash-on-start.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-agent-crash-on-start.js
similarity index 51%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-agent-crash-on-start.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-agent-crash-on-start.js
index a62834ffcb4f27..fe877359c2a622 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-agent-crash-on-start.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-agent-crash-on-start.js
@@ -1,9 +1,10 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(`Test that ProfilerAgent start/stop doesn't crash.\n`);
 
-function test() {
   TestRunner.ProfilerAgent.start().then(onStart);
 
   function onStart() {
@@ -15,15 +16,4 @@
     TestRunner.addResult('ProfilerAgent stopped.');
     TestRunner.completeTest();
   }
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-
-<body onload="runTest()">
-<p>
-Test that ProfilerAgent start/stop doesn't crash.
-</p>
-
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-bottom-up-large-tree-search.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-bottom-up-large-tree-search.js
similarity index 84%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-bottom-up-large-tree-search.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-bottom-up-large-tree-search.js
index 693e8add85b6b3..7eae382c5c4bdc 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-bottom-up-large-tree-search.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-bottom-up-large-tree-search.js
@@ -1,10 +1,11 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/profiler-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(`Tests that search works for large bottom-up view of CPU profile.\n`);
+  await TestRunner.loadModule('profiler_test_runner');
 
-function test() {
   var nodesCount = 1000;
   function buildTree(startId, count) {
     // Build a call tree of a chain form: foo1 -> foo2 -> foo3 -> ...
@@ -61,13 +62,4 @@
     TestRunner.addResult(`${node.callUID}: ${node.functionName} ${node.self} ${node.total}`);
   }
   ProfilerTestRunner.completeProfilerTest();
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-Tests that search works for large bottom-up view of CPU profile.
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-bottom-up-times.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-bottom-up-times.js
similarity index 87%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-bottom-up-times.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-bottom-up-times.js
index c84e4aeac7a020..03fbd4120df5e4 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-bottom-up-times.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-bottom-up-times.js
@@ -1,10 +1,11 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/profiler-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(`Tests bottom-up view self and total time calculation in CPU profiler.\n`);
+  await TestRunner.loadModule('profiler_test_runner');
 
-function test() {
   var profileAndExpectations = {
     'title': 'profile1',
     'target': function() {
@@ -80,13 +81,4 @@
     node = node.traverseNextNode(true, null, true);
   }
   ProfilerTestRunner.completeProfilerTest();
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-Tests bottom-up view self and total time calculation in CPU profiler.
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-calculate-time.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-calculate-time.js
similarity index 91%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-calculate-time.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-calculate-time.js
index 4e9c941d4ab9f3..d469de44ba2403 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-calculate-time.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-calculate-time.js
@@ -1,10 +1,11 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/profiler-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(`Tests self and total time calculation in CPU profiler.\n`);
+  await TestRunner.loadModule('profiler_test_runner');
 
-function test() {
   // Profile for 1070ms, 2140 samples.
   var profileAndExpectations = {
     'head': {
@@ -115,13 +116,4 @@
   else
     TestRunner.addResult('FAIL: incorrect node times\n' + JSON.stringify(profileAndExpectations, null, 4));
   TestRunner.completeTest();
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-Tests self and total time calculation in CPU profiler.
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-flame-chart-overview-expected.txt b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-flame-chart-overview-expected.txt
index e17df9d5666c84..7d5042572c55d3 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-flame-chart-overview-expected.txt
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-flame-chart-overview-expected.txt
@@ -1,5 +1,5 @@
 Tests Overview pane calculation in FlameChart for different width = 2^n with n in range 4 - 0.
-Also tests loading of a legacy nodes format, where nodes were represented as a tree.
+      Also tests loading of a legacy nodes format, where nodes were represented as a tree.
 
 log: 14,14,1,1,1,1,1,1,1,1,1,1,1,11,15,1
 log: 14,1,1,1,1,1,11,15
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-flame-chart-overview.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-flame-chart-overview.js
similarity index 98%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-flame-chart-overview.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-flame-chart-overview.js
index b80fb90f7a7353..1559e2519cb65b 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-flame-chart-overview.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-flame-chart-overview.js
@@ -1,10 +1,14 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/profiler-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(
+      `Tests Overview pane calculation in FlameChart for different width = 2^n with n in range 4 - 0.
+      Also tests loading of a legacy nodes format, where nodes were represented as a tree.\n`);
+  await TestRunner.loadModule('profiler_test_runner');
+  TestRunner.printDevToolsConsole();
 
-function test() {
   var profileAndExpectations = {
     _profile: {
       'head': {
@@ -859,15 +863,4 @@
   console.log(Object.values(overviewPane._calculateDrawData(2)));
   console.log(Object.values(overviewPane._calculateDrawData(1)));
   TestRunner.completeTest();
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-Tests Overview pane calculation in FlameChart for different width = 2^n with n in range 4 - 0.<br/>
-Also tests loading of a legacy nodes format, where nodes were represented as a tree.
-
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-native-nodes-filter-expected.txt b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-native-nodes-filter-expected.txt
index 25e302138ae84e..b5922933f1ff18 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-native-nodes-filter-expected.txt
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-native-nodes-filter-expected.txt
@@ -1,5 +1,5 @@
 Tests filtering of native nodes.
-Also tests loading of a legacy nodes format, where nodes were represented as a tree.
+    Also tests loading of a legacy nodes format, where nodes were represented as a tree.
 
 (root) id:1 total:134330 self:100000 depth:-1
   C id:7 total:23000 self:22000 depth:0
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-native-nodes-filter.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-native-nodes-filter.js
similarity index 88%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-native-nodes-filter.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-native-nodes-filter.js
index d04b948e767f7f..0291c98246b3d4 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-native-nodes-filter.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-native-nodes-filter.js
@@ -1,10 +1,12 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/profiler-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(`Tests filtering of native nodes.
+    Also tests loading of a legacy nodes format, where nodes were represented as a tree.\n`);
+  await TestRunner.loadModule('profiler_test_runner');
 
-function test() {
   var profile = {
     'head': {
       'callFrame': {'functionName': '(root)', 'scriptId': '0', 'url': '', 'lineNumber': 0},
@@ -84,14 +86,4 @@
   }
   TestRunner.addResult(model.samples.join(', '));
   TestRunner.completeTest();
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-Tests filtering of native nodes.<br/>
-Also tests loading of a legacy nodes format, where nodes were represented as a tree.
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-profile-removal.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-profile-removal.js
similarity index 57%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-profile-removal.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-profile-removal.js
index 7936d6227d75c2..2eaefcdaf07fab 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-profile-removal.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-profile-removal.js
@@ -1,19 +1,23 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/profiler-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
 
-function pageFunction() {
-    console.profile("p1");
-    console.profileEnd("p1");
-    console.profile("p1");
-    console.profileEnd("p1");
-    console.profile("p2");
-    console.profileEnd("p2");
-}
+(async function() {
+  TestRunner.addResult(`Tests that CPU profile removal from a group works. Bug 110466\n`);
+  await TestRunner.loadModule('profiler_test_runner');
+  await TestRunner.showPanel('js_profiler');
+
+  await TestRunner.evaluateInPagePromise(`
+      function pageFunction() {
+          console.profile("p1");
+          console.profileEnd("p1");
+          console.profile("p1");
+          console.profileEnd("p1");
+          console.profile("p2");
+          console.profileEnd("p2");
+      }
+  `);
 
-function test() {
   ProfilerTestRunner.startProfilerTest(function() {
     function viewLoaded() {
       var profiles = UI.panels.js_profiler;
@@ -31,15 +35,4 @@
     ProfilerTestRunner.showProfileWhenAdded('p2');
     ProfilerTestRunner.waitUntilProfileViewIsShown('p2', setTimeout.bind(null, viewLoaded, 0));
   });
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-Tests that CPU profile removal from a group works.
-
-<a href="https://bugs.webkit.org/show_bug.cgi?id=110466">Bug 110466</a>
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-save-load.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-save-load.js
similarity index 85%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-save-load.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-save-load.js
index 5f48ca545ee4d0..dbb8baf9b2ad95 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-save-load.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-save-load.js
@@ -1,15 +1,18 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/profiler-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
 
-function pageFunction() {
-    console.profile("manual");
-    console.profileEnd("manual");
-}
+(async function() {
+  TestRunner.addResult(`Tests that CPU profiling is able to save/load.\n`);
+  await TestRunner.loadModule('profiler_test_runner');
+  await TestRunner.showPanel('js_profiler');
+  await TestRunner.evaluateInPagePromise(`
+      function pageFunction() {
+          console.profile("manual");
+          console.profileEnd("manual");
+      }
+  `);
 
-function test() {
   MockedFile = function() {
     this._buffer = '';
   };
@@ -100,14 +103,4 @@
     }
 
   ]);
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-Tests that CPU profiling is able to save/load.
-
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-stopped-removed-race.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-stopped-removed-race.js
similarity index 76%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-stopped-removed-race.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-stopped-removed-race.js
index ea6a4436dd2d05..791fe9f5130bca 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-stopped-removed-race.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/cpu-profiler-stopped-removed-race.js
@@ -1,10 +1,12 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/profiler-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(`Tests that profile removal right after stop profiling issued works. Bug 476430.\n`);
+  await TestRunner.loadModule('profiler_test_runner');
+  await TestRunner.showPanel('js_profiler');
 
-function test() {
   ProfilerTestRunner.runProfilerTestSuite([function testProfiling(next) {
     var cpuProfiler = TestRunner.cpuProfilerModel;
     var targetManager = SDK.targetManager;
@@ -37,15 +39,4 @@
       TestRunner.addResult('Recording stopped. profile (should be null): ' + profile);
     }
   }]);
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-Tests that profile removal right after stop profiling issued works.
-
-<a href="http://crbug.com/476430">Bug 476430.</a>
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-dom-groups-change.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-dom-groups-change.js
similarity index 86%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-dom-groups-change.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-dom-groups-change.js
index 0a002339b40e1f..15e48f63957573 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-dom-groups-change.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-dom-groups-change.js
@@ -1,10 +1,13 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/heap-snapshot-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(
+      `Tests that Comparison view of heap snapshots will contain added nodes even if their ids are less than the maximumm JS object id in the base snapshot.\n`);
+  await TestRunner.loadModule('heap_snapshot_test_runner');
+  await TestRunner.showPanel('heap_profiler');
 
-function test() {
   function createHeapSnapshotA() {
     // Represents the following graph:
     //  root - 0 -> <class = A, id = 10>
@@ -97,14 +100,4 @@
       next();
     }
   }]);
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-Tests that Comparison view of heap snapshots will contain added nodes even if
-their ids are less than the maximumm JS object id in the base snapshot.
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-expansion-preserved-when-sorting.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-expansion-preserved-when-sorting.js
similarity index 88%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-expansion-preserved-when-sorting.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-expansion-preserved-when-sorting.js
index ea52a377f7abec..1128fcc3884284 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-expansion-preserved-when-sorting.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-expansion-preserved-when-sorting.js
@@ -1,10 +1,13 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/heap-snapshot-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(
+      `Tests Comparison view of detailed heap snapshots. Expanded nodes must be preserved after sorting.\n`);
+  await TestRunner.loadModule('heap_snapshot_test_runner');
+  await TestRunner.showPanel('heap_profiler');
 
-function test() {
   var instanceCount = 24;
   function createHeapSnapshotA() {
     return HeapSnapshotTestRunner.createHeapSnapshot(instanceCount, 5);
@@ -90,14 +93,4 @@
       setTimeout(next, 0);
     }
   }]);
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-Tests Comparison view of detailed heap snapshots.
-Expanded nodes must be preserved after sorting.
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-show-all.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-show-all.js
similarity index 85%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-show-all.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-show-all.js
index 043436353162e4..11cf48297026a1 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-show-all.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-show-all.js
@@ -1,10 +1,13 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/heap-snapshot-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(
+      `Tests Comparison view of detailed heap snapshots. The "Show All" button must show all nodes.\n`);
+  await TestRunner.loadModule('heap_snapshot_test_runner');
+  await TestRunner.showPanel('heap_profiler');
 
-function test() {
   var instanceCount = 24;
   var firstId = 100;
   function createHeapSnapshotA() {
@@ -68,14 +71,4 @@
       setTimeout(next, 0);
     }
   }]);
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-Tests Comparison view of detailed heap snapshots.
-The &quot;Show All&quot; button must show all nodes.
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-show-next.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-show-next.js
similarity index 79%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-show-next.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-show-next.js
index 91d0dac7544ac2..c2a4a7adb45401 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-show-next.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-show-next.js
@@ -1,10 +1,19 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/heap-snapshot-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(
+      `Tests Comparison view of detailed heap snapshots. Repeated clicks on "Show Next" button must show all nodes.\n`);
+  await TestRunner.loadModule('heap_snapshot_test_runner');
+  await TestRunner.showPanel('heap_profiler');
+  await TestRunner.loadHTML(`
+      <p>
+      Tests Comparison view of detailed heap snapshots.
+      Repeated clicks on &quot;Show Next&quot; button must show all nodes.
+      </p>
+    `);
 
-function test() {
   var instanceCount = 24;
   function createHeapSnapshotA() {
     return HeapSnapshotTestRunner.createHeapSnapshot(instanceCount, 5);
@@ -64,14 +73,4 @@
       }
     }
   }]);
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-Tests Comparison view of detailed heap snapshots.
-Repeated clicks on &quot;Show Next&quot; button must show all nodes.
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-shown-node-count-preserved-when-sorting.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-shown-node-count-preserved-when-sorting.js
similarity index 80%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-shown-node-count-preserved-when-sorting.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-shown-node-count-preserved-when-sorting.js
index ff96decb7223ac..c6b4709f6bbb95 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-shown-node-count-preserved-when-sorting.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-shown-node-count-preserved-when-sorting.js
@@ -1,10 +1,19 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/heap-snapshot-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(
+      `Tests Comparison view of detailed heap snapshots. Shown node count must be preserved after sorting.\n`);
+  await TestRunner.loadModule('heap_snapshot_test_runner');
+  await TestRunner.showPanel('heap_profiler');
+  await TestRunner.loadHTML(`
+      <p>
+      Tests Comparison view of detailed heap snapshots.
+      Shown node count must be preserved after sorting.
+      </p>
+    `);
 
-function test() {
   var instanceCount = 24;
   function createHeapSnapshotA() {
     return HeapSnapshotTestRunner.createHeapSnapshot(instanceCount, 5);
@@ -70,14 +79,4 @@
       setTimeout(next, 0);
     }
   }]);
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-Tests Comparison view of detailed heap snapshots.
-Shown node count must be preserved after sorting.
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-sorting.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-sorting.js
similarity index 83%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-sorting.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-sorting.js
index 2f9e2930023a4a..1dd6e31698a27c 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-sorting.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-comparison-sorting.js
@@ -1,10 +1,12 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/heap-snapshot-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(`Tests sorting in Comparison view of detailed heap snapshots.\n`);
+  await TestRunner.loadModule('heap_snapshot_test_runner');
+  await TestRunner.showPanel('heap_profiler');
 
-function test() {
   var instanceCount = 24;
   function createHeapSnapshotA() {
     return HeapSnapshotTestRunner.createHeapSnapshot(instanceCount, 5);
@@ -69,13 +71,4 @@
       setTimeout(step3, 0);
     }
   }]);
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-Tests sorting in Comparison view of detailed heap snapshots.
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-containment-expansion-preserved-when-sorting.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-containment-expansion-preserved-when-sorting.js
similarity index 76%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-containment-expansion-preserved-when-sorting.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-containment-expansion-preserved-when-sorting.js
index 4bc67689c6cab2..dd490583e4870c 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-containment-expansion-preserved-when-sorting.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-containment-expansion-preserved-when-sorting.js
@@ -1,10 +1,19 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/heap-snapshot-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(
+      `Tests Containment view of detailed heap snapshots. Expanded nodes must be preserved after sorting.\n`);
+  await TestRunner.loadModule('heap_snapshot_test_runner');
+  await TestRunner.showPanel('heap_profiler');
+  await TestRunner.loadHTML(`
+      <p>
+      Tests Containment view of detailed heap snapshots.
+      Expanded nodes must be preserved after sorting.
+      </p>
+    `);
 
-function test() {
   var instanceCount = 25;
   function createHeapSnapshot() {
     return HeapSnapshotTestRunner.createHeapSnapshot(instanceCount);
@@ -62,14 +71,4 @@
       setTimeout(next, 0);
     }
   }]);
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-Tests Containment view of detailed heap snapshots.
-Expanded nodes must be preserved after sorting.
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-containment-show-all.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-containment-show-all.js
similarity index 86%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-containment-show-all.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-containment-show-all.js
index 59d17ff4f37fc7..5588c9cb7e7e89 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-containment-show-all.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-containment-show-all.js
@@ -1,10 +1,20 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/heap-snapshot-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(
+      `Tests Containment view of detailed heap snapshots. The "Show All" button must show all nodes. Test object distances calculation.\n`);
+  await TestRunner.loadModule('heap_snapshot_test_runner');
+  await TestRunner.showPanel('heap_profiler');
+  await TestRunner.loadHTML(`
+      <p>
+      Tests Containment view of detailed heap snapshots.
+      The &quot;Show All&quot; button must show all nodes.
+      Test object distances calculation.
+      </p>
+    `);
 
-function test() {
   var instanceCount = 25;
   function createHeapSnapshot() {
     return HeapSnapshotTestRunner.createHeapSnapshot(instanceCount);
@@ -56,7 +66,8 @@
         var builder = new HeapSnapshotTestRunner.HeapSnapshotBuilder();
         var rootNode = builder.rootNode;
 
-        var gcRootsNode = new HeapSnapshotTestRunner.HeapNode('(GC roots)', 0, HeapSnapshotTestRunner.HeapNode.Type.synthetic);
+        var gcRootsNode =
+            new HeapSnapshotTestRunner.HeapNode('(GC roots)', 0, HeapSnapshotTestRunner.HeapNode.Type.synthetic);
         rootNode.linkNode(gcRootsNode, HeapSnapshotTestRunner.HeapEdge.Type.element);
 
         var globalHandlesNode = new HeapSnapshotTestRunner.HeapNode('(Global Handles)');
@@ -129,15 +140,4 @@
       }
     }
   ]);
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-Tests Containment view of detailed heap snapshots.
-The &quot;Show All&quot; button must show all nodes.
-Test object distances calculation.
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-containment-show-next.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-containment-show-next.js
similarity index 66%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-containment-show-next.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-containment-show-next.js
index 116d35b0612bc5..06b105ac397027 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-containment-show-next.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-containment-show-next.js
@@ -1,10 +1,19 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/heap-snapshot-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(
+      `Tests Containment view of detailed heap snapshots. Repeated clicks on "Show Next" button must show all nodes.\n`);
+  await TestRunner.loadModule('heap_snapshot_test_runner');
+  await TestRunner.showPanel('heap_profiler');
+  await TestRunner.loadHTML(`
+      <p>
+      Tests Containment view of detailed heap snapshots.
+      Repeated clicks on &quot;Show Next&quot; button must show all nodes.
+      </p>
+    `);
 
-function test() {
   var instanceCount = 25;
   function createHeapSnapshot() {
     return HeapSnapshotTestRunner.createHeapSnapshot(instanceCount);
@@ -36,14 +45,4 @@
       }
     }
   }]);
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-Tests Containment view of detailed heap snapshots.
-Repeated clicks on &quot;Show Next&quot; button must show all nodes.
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-containment-shown-node-count-preserved-when-sorting.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-containment-shown-node-count-preserved-when-sorting.js
similarity index 73%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-containment-shown-node-count-preserved-when-sorting.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-containment-shown-node-count-preserved-when-sorting.js
index 12537b95c15b49..31462e953b8f1f 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-containment-shown-node-count-preserved-when-sorting.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-containment-shown-node-count-preserved-when-sorting.js
@@ -1,10 +1,19 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/heap-snapshot-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(
+      `Tests Containment view of detailed heap snapshots. Shown node count must be preserved after sorting.\n`);
+  await TestRunner.loadModule('heap_snapshot_test_runner');
+  await TestRunner.showPanel('heap_profiler');
+  await TestRunner.loadHTML(`
+      <p>
+      Tests Containment view of detailed heap snapshots.
+      Shown node count must be preserved after sorting.
+      </p>
+    `);
 
-function test() {
   var instanceCount = 25;
   function createHeapSnapshot() {
     return HeapSnapshotTestRunner.createHeapSnapshot(instanceCount);
@@ -54,14 +63,4 @@
       setTimeout(next, 0);
     }
   }]);
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-Tests Containment view of detailed heap snapshots.
-Shown node count must be preserved after sorting.
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-containment-sorting.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-containment-sorting.js
similarity index 81%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-containment-sorting.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-containment-sorting.js
index 27be53bfd0c7ea..24c4a433e7c8ca 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-containment-sorting.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-containment-sorting.js
@@ -1,10 +1,12 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/heap-snapshot-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(`Tests sorting in Containment view of detailed heap snapshots.\n`);
+  await TestRunner.loadModule('heap_snapshot_test_runner');
+  await TestRunner.showPanel('heap_profiler');
 
-function test() {
   var instanceCount = 25;
   function createHeapSnapshot() {
     return HeapSnapshotTestRunner.createHeapSnapshot(instanceCount);
@@ -61,13 +63,4 @@
       setTimeout(step4, 0);
     }
   }]);
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-Tests sorting in Containment view of detailed heap snapshots.
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-event-listeners.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-event-listeners.js
similarity index 65%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-event-listeners.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-event-listeners.js
index 502b1242b970c7..23fd6084707c5d 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-event-listeners.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-event-listeners.js
@@ -1,22 +1,23 @@
-<html>
-<head>
-<script src="../../inspector/inspector-test.js"></script>
-<script src="../resources/heap-snapshot-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(
+      `Test that event listeners not user reachable from the root are still present in the class list.\n`);
+  await TestRunner.loadModule('heap_snapshot_test_runner');
+  await TestRunner.showPanel('heap_profiler');
+  await TestRunner.evaluateInPagePromise(`
+      class EventListenerWrapperTest {
+        constructor() {
+          this.x = 42;
+          window.addEventListener('mousemove', event => console.log(this.x));
+        }
+      }
+
+      new EventListenerWrapperTest();
+  `);
 
-class EventListenerWrapperTest {
-  constructor() {
-    this.x = 42;
-    window.addEventListener('mousemove', event => console.log(this.x));
-  }
-}
-
-function handleLoad() {
-  new EventListenerWrapperTest();
-  runTest();
-}
-
-function test() {
   var heapProfileType = Profiler.ProfileTypeRegistry.instance.heapSnapshotProfileType;
   heapProfileType.addEventListener(Profiler.HeapSnapshotProfileType.SnapshotReceived, finishHeapSnapshot);
   TestRunner.addSniffer(heapProfileType, '_snapshotReceived', snapshotReceived);
@@ -52,15 +53,4 @@
       TestRunner.addResult(errorMessage);
     TestRunner.completeTest();
   }
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-
-<body onload="handleLoad()">
-<p>
-Test that event listeners not user reachable from the root are still present in the class list.
-</p>
-
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-inspect-dom-wrapper.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-inspect-dom-wrapper.js
similarity index 77%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-inspect-dom-wrapper.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-inspect-dom-wrapper.js
index 251effa082db5e..b6f41ad8f60bd1 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-inspect-dom-wrapper.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-inspect-dom-wrapper.js
@@ -1,17 +1,17 @@
-<html>
-<head>
-<script src="../../inspector/inspector-test.js"></script>
-<script src="../resources/heap-snapshot-test.js"></script>
-<script>
-
-function handleLoad()
-{
-    // Make sure there is a body wrapper.
-    document.body.fieldOnDomWrapper = 2012;
-    runTest();
-}
-
-function test() {
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(
+      `Test that resolving heap snapshot object to a JS object will not crash on DOM wrapper boilerplate. Test passes if it doesn't crash.\n`);
+  await TestRunner.loadModule('heap_snapshot_test_runner');
+  await TestRunner.showPanel('heap_profiler');
+  await TestRunner.evaluateInPagePromise(`
+      // Make sure there is a body wrapper.
+      document.body.fieldOnDomWrapper = 2012;
+  `);
+
   var heapProfileType = Profiler.ProfileTypeRegistry.instance.heapSnapshotProfileType;
   heapProfileType.addEventListener(Profiler.HeapSnapshotProfileType.SnapshotReceived, finishHeapSnapshot);
   TestRunner.addSniffer(heapProfileType, '_snapshotReceived', snapshotReceived);
@@ -71,15 +71,4 @@
     TestRunner.addResult('PASS: profile was deleted');
     TestRunner.completeTest();
   }
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-
-<body onload="handleLoad()">
-<p>
-Test that resolving heap snapshot object to a JS object will not crash on DOM wrapper boilerplate. Test passes if it doesn't crash.
-</p>
-
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-loader.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-loader.js
similarity index 88%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-loader.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-loader.js
index 5fd4af887e92ac..5797f462a83cd0 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-loader.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-loader.js
@@ -1,10 +1,12 @@
-<html>
-<head>
-<script src="../../inspector/inspector-test.js"></script>
-<script src="../resources/heap-snapshot-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(`This test checks HeapSnapshots loader.\n`);
+  await TestRunner.loadModule('heap_snapshot_test_runner');
+  await TestRunner.showPanel('heap_profiler');
 
-function test() {
   var source = HeapSnapshotTestRunner.createHeapSnapshotMockRaw();
   var sourceStringified = JSON.stringify(source);
   var partSize = sourceStringified.length >> 3;
@@ -35,7 +37,7 @@
   }
 
   Common.console.log = function(message) {
-    TestRunner.addResult('TestRunner.consoleModel.log: ' + message);
+    TestRunner.addResult('ConsoleModel.consoleModel.log: ' + message);
   };
 
   TestRunner.runTestSuite([
@@ -111,15 +113,4 @@
       injectMockProfile(snapshotLoaded);
     }
   ]);
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-
-<body onload="runTest()">
-<p>
-This test checks HeapSnapshots loader.
-</p>
-
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-orphan-nodes-expected.txt b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-orphan-nodes-expected.txt
index 0244e713d886a5..56cfad3747d079 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-orphan-nodes-expected.txt
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-orphan-nodes-expected.txt
@@ -1,4 +1,5 @@
 Tests that weak references are ignored when dominators are calculated and that weak references won't affect object's retained size.
+
 Profiler was enabled.
 Detailed heap profiles were enabled.
 
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-orphan-nodes.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-orphan-nodes.js
similarity index 87%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-orphan-nodes.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-orphan-nodes.js
index 7e5d20bf0983ca..67c24fe2e36ce4 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-orphan-nodes.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-orphan-nodes.js
@@ -1,10 +1,16 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/heap-snapshot-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(
+      `Tests that weak references are ignored when dominators are calculated and that weak references won't affect object's retained size.\n`);
+  await TestRunner.loadModule('heap_snapshot_test_runner');
+  await TestRunner.showPanel('heap_profiler');
+  await TestRunner.loadHTML(`
+      <pre></pre>
+    `);
 
-function test() {
   HeapSnapshotTestRunner.runHeapSnapshotTestSuite([function testWeakReferencesDoNotAffectRetainedSize(next) {
     function createHeapSnapshot() {
       // Mocking a heap snapshot with a node that retained by weak references only.
@@ -85,13 +91,4 @@
       setTimeout(next, 0);
     }
   }]);
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<pre>
-Tests that weak references are ignored when dominators are calculated and that weak references won't affect object's retained size.
-</pre>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-statistics.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-statistics.js
similarity index 71%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-statistics.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-statistics.js
index d1393412b6b743..96de41a544b0d0 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-statistics.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-statistics.js
@@ -1,10 +1,12 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/heap-snapshot-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(`Tests Statistics view of detailed heap snapshots.\n`);
+  await TestRunner.loadModule('heap_snapshot_test_runner');
+  await TestRunner.showPanel('heap_profiler');
 
-function test() {
   function createHeapSnapshot() {
     var builder = new HeapSnapshotTestRunner.HeapSnapshotBuilder();
     var index = 0;
@@ -25,11 +27,14 @@
     builder.rootNode.linkNode(jsArrayNode, HeapSnapshotTestRunner.HeapEdge.Type.internal, 'JSArrayLink');
     var jsArrayContentsNode = new HeapSnapshotTestRunner.HeapNode('', 12, HeapSnapshotTestRunner.HeapNode.Type.array);
     jsArrayNode.linkNode(jsArrayContentsNode, HeapSnapshotTestRunner.HeapEdge.Type.internal, 'elements');
-    var gcRootsNode = new HeapSnapshotTestRunner.HeapNode('(GC roots)', 0, HeapSnapshotTestRunner.HeapNode.Type.synthetic);
+    var gcRootsNode =
+        new HeapSnapshotTestRunner.HeapNode('(GC roots)', 0, HeapSnapshotTestRunner.HeapNode.Type.synthetic);
     builder.rootNode.linkNode(gcRootsNode, HeapSnapshotTestRunner.HeapEdge.Type.internal, '0');
-    var strongRoots = new HeapSnapshotTestRunner.HeapNode('(Strong roots)', 0, HeapSnapshotTestRunner.HeapNode.Type.synthetic);
+    var strongRoots =
+        new HeapSnapshotTestRunner.HeapNode('(Strong roots)', 0, HeapSnapshotTestRunner.HeapNode.Type.synthetic);
     gcRootsNode.linkNode(strongRoots, HeapSnapshotTestRunner.HeapEdge.Type.internal, '0');
-    var systemObj = new HeapSnapshotTestRunner.HeapNode('SystemObject', 900000000, HeapSnapshotTestRunner.HeapNode.Type.object);
+    var systemObj =
+        new HeapSnapshotTestRunner.HeapNode('SystemObject', 900000000, HeapSnapshotTestRunner.HeapNode.Type.object);
     strongRoots.linkNode(systemObj, HeapSnapshotTestRunner.HeapEdge.Type.internal, '0');
     return builder.generateSnapshot();
   }
@@ -44,13 +49,4 @@
       setTimeout(next, 0);
     }
   }]);
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-Tests Statistics view of detailed heap snapshots.
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-expand-collapse.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-expand-collapse.js
similarity index 54%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-expand-collapse.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-expand-collapse.js
index 7d19e28ff5c302..305f38fdb1eb1c 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-expand-collapse.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-expand-collapse.js
@@ -1,10 +1,19 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/heap-snapshot-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(
+      `https://crbug.com/738932 Tests the snapshot view is not empty on repeatitive expand-collapse.\n`);
+  await TestRunner.loadModule('heap_snapshot_test_runner');
+  await TestRunner.showPanel('heap_profiler');
+  await TestRunner.loadHTML(`
+      <p>
+      https://crbug.com/738932
+      Tests the snapshot view is not empty on repeatitive expand-collapse.
+      </p>
+    `);
 
-function test() {
   var instanceCount = 25;
   function createHeapSnapshot() {
     return HeapSnapshotTestRunner.createHeapSnapshot(instanceCount);
@@ -29,14 +38,4 @@
       next();
     }
   }]);
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-https://crbug.com/738932
-Tests the snapshot view is not empty on repeatitive expand-collapse.
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-expansion-preserved-when-sorting.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-expansion-preserved-when-sorting.js
similarity index 78%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-expansion-preserved-when-sorting.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-expansion-preserved-when-sorting.js
index dc9d7636f45f19..6d90645f2193af 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-expansion-preserved-when-sorting.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-expansion-preserved-when-sorting.js
@@ -1,10 +1,19 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/heap-snapshot-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(
+      `Tests Summary view of detailed heap snapshots. Expanded nodes must be preserved after sorting.\n`);
+  await TestRunner.loadModule('heap_snapshot_test_runner');
+  await TestRunner.showPanel('heap_profiler');
+  await TestRunner.loadHTML(`
+      <p>
+      Tests Summary view of detailed heap snapshots.
+      Expanded nodes must be preserved after sorting.
+      </p>
+    `);
 
-function test() {
   var instanceCount = 25;
   function createHeapSnapshot() {
     return HeapSnapshotTestRunner.createHeapSnapshot(instanceCount);
@@ -65,14 +74,4 @@
       setTimeout(next, 0);
     }
   }]);
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-Tests Summary view of detailed heap snapshots.
-Expanded nodes must be preserved after sorting.
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-retainers-expected.txt b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-retainers-expected.txt
index b8f08a7c0f1a34..fd8aaba50c52b8 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-retainers-expected.txt
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-retainers-expected.txt
@@ -1,8 +1,9 @@
 Tests retainers view.
-- Number of retainers of an A object must be 2 (A itself and B).
-- When an object has just one retainer it must be expanded automatically until
-  there's an object having two or more retainers.
-- Test the expansion of a long retainment chain is limited by a certain level.
+    - Number of retainers of an A object must be 2 (A itself and B).
+    - When an object has just one retainer it must be expanded automatically until
+      there's an object having two or more retainers.
+    - Test the expansion of a long retainment chain is limited by a certain level.
+
 Profiler was enabled.
 Detailed heap profiles were enabled.
 
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-retainers.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-retainers.js
similarity index 91%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-retainers.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-retainers.js
index ab88c30d205d42..db28864c86ce05 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-retainers.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-retainers.js
@@ -1,10 +1,16 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/heap-snapshot-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(`Tests retainers view.
+    - Number of retainers of an A object must be 2 (A itself and B).
+    - When an object has just one retainer it must be expanded automatically until
+      there's an object having two or more retainers.
+    - Test the expansion of a long retainment chain is limited by a certain level.\n`);
+  await TestRunner.loadModule('heap_snapshot_test_runner');
+  await TestRunner.showPanel('heap_profiler');
 
-function test() {
   var instanceCount = 25;
   function createHeapSnapshot() {
     return HeapSnapshotTestRunner.createHeapSnapshot(instanceCount);
@@ -172,17 +178,4 @@
       }
     }
   ]);
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<pre>
-Tests retainers view.
-- Number of retainers of an A object must be 2 (A itself and B).</ul>
-- When an object has just one retainer it must be expanded automatically until
-  there's an object having two or more retainers.
-- Test the expansion of a long retainment chain is limited by a certain level.
-</pre>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-search-by-id.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-search-by-id.js
similarity index 88%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-search-by-id.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-search-by-id.js
index 586b457b6471e9..e3adbd1c7a2268 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-search-by-id.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-search-by-id.js
@@ -1,10 +1,12 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/heap-snapshot-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(`Tests search in Summary view of detailed heap snapshots.\n`);
+  await TestRunner.loadModule('heap_snapshot_test_runner');
+  await TestRunner.showPanel('heap_profiler');
 
-function test() {
   var instanceCount = 200;
   function createHeapSnapshot() {
     return HeapSnapshotTestRunner.createHeapSnapshot(instanceCount, 100);
@@ -88,13 +90,4 @@
       return onSuccess();
     }
   }]);
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-Tests search in Summary view of detailed heap snapshots.
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-search.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-search.js
similarity index 86%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-search.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-search.js
index 029a6c9f9f06f1..9426142192506b 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-search.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-search.js
@@ -1,10 +1,12 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/heap-snapshot-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(`Tests search in Summary view of detailed heap snapshots.\n`);
+  await TestRunner.loadModule('heap_snapshot_test_runner');
+  await TestRunner.showPanel('heap_profiler');
 
-function test() {
   var instanceCount = 25;
   function createHeapSnapshot() {
     return HeapSnapshotTestRunner.createHeapSnapshot(instanceCount);
@@ -68,13 +70,4 @@
       next();
     }
   }]);
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-Tests search in Summary view of detailed heap snapshots.
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-show-all.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-show-all.js
similarity index 73%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-show-all.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-show-all.js
index c8865337e7ca78..65a886b8bc99e7 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-show-all.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-show-all.js
@@ -1,10 +1,18 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/heap-snapshot-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(`Tests Summary view of detailed heap snapshots. The "Show All" button must show all nodes.\n`);
+  await TestRunner.loadModule('heap_snapshot_test_runner');
+  await TestRunner.showPanel('heap_profiler');
+  await TestRunner.loadHTML(`
+      <p>
+      Tests Summary view of detailed heap snapshots.
+      The &quot;Show All&quot; button must show all nodes.
+      </p>
+    `);
 
-function test() {
   var instanceCount = 25;
   function createHeapSnapshot() {
     return HeapSnapshotTestRunner.createHeapSnapshot(instanceCount);
@@ -46,14 +54,4 @@
       setTimeout(next, 0);
     }
   }]);
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-Tests Summary view of detailed heap snapshots.
-The &quot;Show All&quot; button must show all nodes.
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-show-next.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-show-next.js
similarity index 68%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-show-next.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-show-next.js
index 10f01bcbb7e72b..aefa2140a10b5a 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-show-next.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-show-next.js
@@ -1,10 +1,19 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/heap-snapshot-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(
+      `Tests Summary view of detailed heap snapshots. Repeated clicks on "Show Next" button must show all nodes.\n`);
+  await TestRunner.loadModule('heap_snapshot_test_runner');
+  await TestRunner.showPanel('heap_profiler');
+  await TestRunner.loadHTML(`
+      <p>
+      Tests Summary view of detailed heap snapshots.
+      Repeated clicks on &quot;Show Next&quot; button must show all nodes.
+      </p>
+    `);
 
-function test() {
   var instanceCount = 25;
   function createHeapSnapshot() {
     return HeapSnapshotTestRunner.createHeapSnapshot(instanceCount);
@@ -38,14 +47,4 @@
       }
     }
   }]);
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-Tests Summary view of detailed heap snapshots.
-Repeated clicks on &quot;Show Next&quot; button must show all nodes.
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-show-ranges.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-show-ranges.js
similarity index 77%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-show-ranges.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-show-ranges.js
index 29811883826987..975c5932f8e603 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-show-ranges.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-show-ranges.js
@@ -1,10 +1,12 @@
-<html>
-<head>
-    <script src="../../inspector/inspector-test.js"></script>
-    <script src="../resources/heap-snapshot-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(`Tests showing several node ranges in the Summary view of detailed heap snapshot.\n`);
+  await TestRunner.loadModule('heap_snapshot_test_runner');
+  await TestRunner.showPanel('heap_profiler');
 
-function test() {
   var instanceCount = 50;
   function createHeapSnapshot() {
     return HeapSnapshotTestRunner.createHeapSnapshot(instanceCount);
@@ -44,13 +46,4 @@
       setTimeout(next, 0);
     }
   }]);
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-Tests showing several node ranges in the Summary view of detailed heap snapshot.
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-shown-node-count-preserved-when-sorting.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-shown-node-count-preserved-when-sorting.js
similarity index 75%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-shown-node-count-preserved-when-sorting.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-shown-node-count-preserved-when-sorting.js
index e08e7341fbb173..c21b752b13cb9d 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-shown-node-count-preserved-when-sorting.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-shown-node-count-preserved-when-sorting.js
@@ -1,10 +1,19 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/heap-snapshot-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(
+      `Tests Summary view of detailed heap snapshots. Shown node count must be preserved after sorting.\n`);
+  await TestRunner.loadModule('heap_snapshot_test_runner');
+  await TestRunner.showPanel('heap_profiler');
+  await TestRunner.loadHTML(`
+      <p>
+      Tests Summary view of detailed heap snapshots.
+      Shown node count must be preserved after sorting.
+      </p>
+    `);
 
-function test() {
   var instanceCount = 25;
   function createHeapSnapshot() {
     return HeapSnapshotTestRunner.createHeapSnapshot(instanceCount);
@@ -55,14 +64,4 @@
       setTimeout(next, 0);
     }
   }]);
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-Tests Summary view of detailed heap snapshots.
-Shown node count must be preserved after sorting.
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-sorting-fields.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-sorting-fields.js
similarity index 85%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-sorting-fields.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-sorting-fields.js
index 2dfff5e0665797..1b37f8e55a9b4d 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-sorting-fields.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-sorting-fields.js
@@ -1,10 +1,12 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/heap-snapshot-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(`Tests sorting in Summary view of detailed heap snapshots.\n`);
+  await TestRunner.loadModule('heap_snapshot_test_runner');
+  await TestRunner.showPanel('heap_profiler');
 
-function test() {
   var instanceCount = 10;
   function createHeapSnapshot() {
     return HeapSnapshotTestRunner.createHeapSnapshot(instanceCount);
@@ -71,13 +73,4 @@
       step3();
     }
   }]);
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-Tests sorting in Summary view of detailed heap snapshots.
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-sorting-instances.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-sorting-instances.js
similarity index 83%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-sorting-instances.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-sorting-instances.js
index bd26271be02967..98b89d340517e5 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-sorting-instances.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-sorting-instances.js
@@ -1,10 +1,12 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/heap-snapshot-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(`Tests sorting in Summary view of detailed heap snapshots.\n`);
+  await TestRunner.loadModule('heap_snapshot_test_runner');
+  await TestRunner.showPanel('heap_profiler');
 
-function test() {
   var instanceCount = 10;
   function createHeapSnapshot() {
     return HeapSnapshotTestRunner.createHeapSnapshot(instanceCount);
@@ -66,13 +68,4 @@
       step3();
     }
   }]);
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-Tests sorting in Summary view of detailed heap snapshots.
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-sorting.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-sorting.js
similarity index 80%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-sorting.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-sorting.js
index 0b5c15bb00b399..64797afa4b18f7 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-sorting.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-summary-sorting.js
@@ -1,10 +1,12 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/heap-snapshot-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(`Tests sorting in Summary view of detailed heap snapshots.\n`);
+  await TestRunner.loadModule('heap_snapshot_test_runner');
+  await TestRunner.showPanel('heap_profiler');
 
-function test() {
   var instanceCount = 25;
   function createHeapSnapshot() {
     return HeapSnapshotTestRunner.createHeapSnapshot(instanceCount);
@@ -55,13 +57,4 @@
       setTimeout(step3, 0);
     }
   }]);
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<p>
-Tests sorting in Summary view of detailed heap snapshots.
-</p>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-weak-dominator-expected.txt b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-weak-dominator-expected.txt
index e40b6912534338..ddca1b71aad995 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-weak-dominator-expected.txt
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-weak-dominator-expected.txt
@@ -1,4 +1,5 @@
 Tests that weak references are ignored when dominators are calculated and that weak references won't affect object's retained size.
+
 Profiler was enabled.
 Detailed heap profiles were enabled.
 
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-weak-dominator.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-weak-dominator.js
similarity index 84%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-weak-dominator.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-weak-dominator.js
index 9890065b3cf4d9..78564aef2d5be6 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-weak-dominator.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot-weak-dominator.js
@@ -1,10 +1,16 @@
-<html>
-<head>
-  <script src="../../inspector/inspector-test.js"></script>
-  <script src="../resources/heap-snapshot-test.js"></script>
-<script>
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(
+      `Tests that weak references are ignored when dominators are calculated and that weak references won't affect object's retained size.\n`);
+  await TestRunner.loadModule('heap_snapshot_test_runner');
+  await TestRunner.showPanel('heap_profiler');
+  await TestRunner.loadHTML(`
+      <pre></pre>
+    `);
 
-function test() {
   HeapSnapshotTestRunner.runHeapSnapshotTestSuite([function testWeakReferencesDoNotAffectRetainedSize(next) {
     function createHeapSnapshot() {
       // Mocking results of running the following code:
@@ -71,13 +77,4 @@
       setTimeout(next, 0);
     }
   }]);
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-<body onload="runTest()">
-<pre>
-Tests that weak references are ignored when dominators are calculated and that weak references won't affect object's retained size.
-</pre>
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot.html b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot.js
similarity index 96%
rename from third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot.html
rename to third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot.js
index 9d80f10c009581..3987c8c5f406d7 100644
--- a/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot.html
+++ b/third_party/WebKit/LayoutTests/http/tests/devtools/profiler/heap-snapshot.js
@@ -1,9 +1,12 @@
-<html>
-<head>
-<script src="../../inspector/inspector-test.js"></script>
-<script src="../resources/heap-snapshot-test.js"></script>
-<script>
-function test() {
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+(async function() {
+  TestRunner.addResult(`This test checks HeapSnapshots module.\n`);
+  await TestRunner.loadModule('heap_snapshot_test_runner');
+  await TestRunner.showPanel('heap_profiler');
+
   function createTestEnvironmentInWorker() {
     if (!this.TestRunner)
       TestRunner = {};
@@ -188,8 +191,7 @@
 
         var expectedDominatedNodes = [21, 14, 7, 28, 35];
         var actualDominatedNodes = snapshot._dominatedNodes;
-        TestRunner.assertEquals(
-            expectedDominatedNodes.length, actualDominatedNodes.length, 'Dominated Nodes length');
+        TestRunner.assertEquals(expectedDominatedNodes.length, actualDominatedNodes.length, 'Dominated Nodes length');
         for (var i = 0; i < expectedDominatedNodes.length; ++i)
           TestRunner.assertEquals(expectedDominatedNodes[i], actualDominatedNodes[i], 'Dominated Nodes');
 
@@ -198,8 +200,7 @@
         TestRunner.assertEquals(
             expectedDominatedNodeIndex.length, actualDominatedNodeIndex.length, 'Dominated Nodes Index length');
         for (var i = 0; i < expectedDominatedNodeIndex.length; ++i)
-          TestRunner.assertEquals(
-              expectedDominatedNodeIndex[i], actualDominatedNodeIndex[i], 'Dominated Nodes Index');
+          TestRunner.assertEquals(expectedDominatedNodeIndex[i], actualDominatedNodeIndex[i], 'Dominated Nodes Index');
       },
 
       function heapSnapshotPageOwnedTest(next) {
@@ -379,24 +380,13 @@
   }
 
   var proxy = new Profiler.HeapSnapshotWorkerProxy(function(eventName, arg) {
-    InspectorTest.addResult('Unexpected event from worker: ' + eventName);
+    TestRunner.addResult('Unexpected event from worker: ' + eventName);
   });
   var source = '(' + createTestEnvironmentInWorker + ')();' +
       '(' + HeapSnapshotTestRunner.createHeapSnapshotMockFactories + ')();' +
       '(' + runTestSuiteInWorker + ')();';
   proxy.evaluateForTest(source, function(result) {
-    InspectorTest.addResult(result);
-    InspectorTest.completeTest();
+    TestRunner.addResult(result);
+    TestRunner.completeTest();
   });
-}
-
-</script>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-
-<body onload="runTest()">
-<p>
-This test checks HeapSnapshots module.
-</p>
-
-</body>
-</html>
+})();
diff --git a/third_party/WebKit/Source/devtools/front_end/heap_snapshot_worker/HeapSnapshot.js b/third_party/WebKit/Source/devtools/front_end/heap_snapshot_worker/HeapSnapshot.js
index 2c6519d63a5427..a616ad7aa97865 100644
--- a/third_party/WebKit/Source/devtools/front_end/heap_snapshot_worker/HeapSnapshot.js
+++ b/third_party/WebKit/Source/devtools/front_end/heap_snapshot_worker/HeapSnapshot.js
@@ -3209,3 +3209,10 @@ HeapSnapshotWorker.JSHeapSnapshotRetainerEdge = class extends HeapSnapshotWorker
     return this._edge().isWeak();
   }
 };
+
+(function disableLoggingForTest() {
+  // Runtime doesn't exist because this file is loaded as a one-off
+  // file in some inspector-protocol tests.
+  if (self.Runtime && Runtime.queryParam('test'))
+    console.warn = () => undefined;
+})();
diff --git a/third_party/WebKit/Source/devtools/scripts/migrate_test/migrate_utils.js b/third_party/WebKit/Source/devtools/scripts/migrate_test/migrate_utils.js
index fc5b64300d9874..636d55a1d6db9c 100644
--- a/third_party/WebKit/Source/devtools/scripts/migrate_test/migrate_utils.js
+++ b/third_party/WebKit/Source/devtools/scripts/migrate_test/migrate_utils.js
@@ -95,8 +95,6 @@ function mapTestFilename(filename) {
     namespacePrefix = 'Elements';
     filenamePrefix = 'SetOuterHTML';
   }
-  if (namespacePrefix === 'HeapSnapshot')
-    namespacePrefix = 'Profiler';
   if (namespacePrefix === 'Sass') {
     namespacePrefix = 'SASS';
     filenamePrefix = 'SASS';