[WIP] DevTools: move UISourceCode creation into ResourceScriptMapping

third_party/WebKit/LayoutTests/inspector/sources/dont-diverge-script-evaluated-twice.html

Index: third_party/WebKit/LayoutTests/inspector/sources/dont-diverge-script-evaluated-twice.html
diff --git a/third_party/WebKit/LayoutTests/inspector/sources/dont-diverge-script-evaluated-twice.html b/third_party/WebKit/LayoutTests/inspector/sources/dont-diverge-script-evaluated-twice.html
index 99f430ab4431efc8537be46562f8c41e4c074ad6..a8af8d42b486ad28bf92dcfc6547700045bce595 100644
--- a/third_party/WebKit/LayoutTests/inspector/sources/dont-diverge-script-evaluated-twice.html
+++ b/third_party/WebKit/LayoutTests/inspector/sources/dont-diverge-script-evaluated-twice.html
@@ -4,45 +4,33 @@
 <script src="../../http/tests/inspector/debugger-test.js"></script>
 <script>
 
-var test = function()
+async function test()
 {
-    const scriptSource = "239\n//# sourceURL=test.js";
-    const changedScriptSource = "42\n//# sourceURL=test.js";
+    const scriptSource = "239\n//# sourceURL=foobar.js";
+    const changedScriptSource = "42\n//# sourceURL=foobar.js";
 
-    InspectorTest.startDebuggerTest(step1);
+    InspectorTest.evaluateInPage(scriptSource);
+    var uiSourceCode = await InspectorTest.waitForUISourceCode('foobar.js');
 
-    function step1()
-    {
-        InspectorTest.waitForScriptSource("test.js", step2);
-        InspectorTest.evaluateInPage(scriptSource);
-    }
+    await InspectorTest.showUISourceCodePromise(uiSourceCode);
 
-    function step2(uiSourceCode)
-    {
-        InspectorTest.addSnifferPromise(Bindings.ResourceScriptFile.prototype, "_mappingCheckedForTest").then(() => step3(uiSourceCode));
-        InspectorTest.showScriptSource("test.js");
+    var debuggerModel = InspectorTest.debuggerModel;
+    var scriptFile = Bindings.debuggerWorkspaceBinding.scriptFile(uiSourceCode, debuggerModel);
+    if (!scriptFile) {
+      InspectorTest.addResult("[FAIL]: no script file for test.js");
+      InspectorTest.completeTest();
+      return;
     }
-
-    function step3(uiSourceCode)
-    {
-        var debuggerModel = InspectorTest.debuggerModel;
-        var scriptFile = Bindings.debuggerWorkspaceBinding.scriptFile(uiSourceCode, debuggerModel);
-        if (!scriptFile) {
-            InspectorTest.addResult("[FAIL]: no script file for test.js");
-            InspectorTest.completeDebuggerTest();
-            return;
-        }
-        if (scriptFile.hasDivergedFromVM() || scriptFile.isDivergingFromVM()) {
-            InspectorTest.addResult("[FAIL]: script file is diverged from VM");
-            InspectorTest.completeDebuggerTest();
-            return;
-        }
-
-        InspectorTest.addSnifferPromise(Sources.JavaScriptSourceFrame.prototype, "_didDivergeFromVM").then(dumpDivergeFromVM);
-        InspectorTest.addSnifferPromise(Bindings.ResourceScriptFile.prototype, "_mappingCheckedForTest").then(() => InspectorTest.completeDebuggerTest());
-        InspectorTest.evaluateInPage(changedScriptSource);
+    if (scriptFile.hasDivergedFromVM() || scriptFile.isDivergingFromVM()) {
+      InspectorTest.addResult("[FAIL]: script file is diverged from VM");
+      InspectorTest.completeTest();
+      return;
     }
 
+    InspectorTest.addSnifferPromise(Sources.JavaScriptSourceFrame.prototype, "_didDivergeFromVM").then(dumpDivergeFromVM);
+    InspectorTest.addSnifferPromise(Bindings.ResourceScriptFile.prototype, "_mappingCheckedForTest").then(() => InspectorTest.completeTest());
+    InspectorTest.evaluateInPage(changedScriptSource);
+
     function dumpDivergeFromVM()
     {
         InspectorTest.addResult("[FAIL]: script file was diverged from VM");