DevTools: Promisify Runtime domain

third_party/WebKit/LayoutTests/http/tests/inspector/inspector-test.js

 if (window.GCController)
     GCController.collectAll();
 
 var initialize_InspectorTest = function() {
 Protocol.InspectorBackend.Options.suppressRequestErrors = true;
 var results = [];
 
 function consoleOutputHook(messageType)
 {
     InspectorTest.addResult(messageType + ": " + Array.prototype.slice.call(arguments, 1));
@@ skipping 26 matching lines @@
 {
     InspectorTest.RuntimeAgent.evaluate("completeTest(\"" + escape(JSON.stringify(results)) + "\")", "test");
 }
 
 InspectorTest.flushResults = function()
 {
     InspectorTest.RuntimeAgent.evaluate("flushResults(\"" + escape(JSON.stringify(results)) + "\")", "test");
     results = [];
 }
 
-InspectorTest.evaluateInPage = function(code, callback)
+InspectorTest.evaluateInPage = async function(code, callback)
 {
-    callback = InspectorTest.safeWrap(callback);
-
-    function mycallback(error, result, exceptionDetails)
-    {
-        if (!error)
-            callback(InspectorTest.runtimeModel.createRemoteObject(result), exceptionDetails);
-    }
-    InspectorTest.RuntimeAgent.evaluate(code, "console", false, mycallback);
+    var response = await InspectorTest.RuntimeAgent.invoke_evaluate({
+        expression: code,
+        objectGroup: "console"
+    });
+    if (!response[Protocol.Error])
+        InspectorTest.safeWrap(callback)(InspectorTest.runtimeModel.createRemoteObject(response.result), response.exceptionDetails);
 }
 
 InspectorTest.addScriptUISourceCode = function(url, content, isContentScript, worldId) {
     content += '\n//# sourceURL=' + url;
     if (isContentScript)
         content = `testRunner.evaluateScriptInIsolatedWorld(${worldId}, \`${content}\`)`;
     InspectorTest.evaluateInPagePromise(content);
     return InspectorTest.waitForUISourceCode(url);
 }
 
 InspectorTest.addScriptForFrame = function(url, content, frame) {
     content += '\n//# sourceURL=' + url;
     var executionContext = InspectorTest.runtimeModel.executionContexts().find(context => context.frameId === frame.id);
-    InspectorTest.RuntimeAgent.evaluate(content, "console", false, false, executionContext.id, function() { });
+    InspectorTest.RuntimeAgent.evaluate(content, "console", false, false, executionContext.id);
 }
 
 InspectorTest.evaluateInPagePromise = function(code)
 {
     return new Promise(succ => InspectorTest.evaluateInPage(code, succ));
 }
 
-InspectorTest.evaluateInPageAsync = function(code)
+InspectorTest.evaluateInPageAsync = async function(code)
 {
-    var callback;
-    var promise = new Promise((fulfill) => { callback = fulfill });
-    InspectorTest.RuntimeAgent.evaluate(code,
-        "console",
-        /* includeCommandLineAPI */ false,
-        /* doNotPauseOnExceptionsAndMuteConsole */ undefined,
-        /* contextId */ undefined,
-        /* returnByValue */ undefined,
-        /* generatePreview */ undefined,
-        /* userGesture */ undefined,
-        /* awaitPromise */ true,
-        mycallback);
+    var response = await InspectorTest.RuntimeAgent.invoke_evaluate({
+        expression: code,
+        objectGroup: "console",
+        includeCommandLineAPI: false,
+        silent: undefined,
+        contextId: undefined,
+        returnByValue: undefined,
+        generatePreview: undefined,
+        userGesture: undefined,
+        awaitPromise: true
+    });
 
-    function mycallback(error, result, exceptionDetails)
-    {
-        if (!error && !exceptionDetails) {
-            callback(InspectorTest.runtimeModel.createRemoteObject(result));
-        } else {
-            if (error)
-                InspectorTest.addResult("Error: " + error);
-            else
-                InspectorTest.addResult("Error: " + (exceptionDetails ? exceptionDetails.text : " exception while evaluation in page."));
-            InspectorTest.completeTest();
-        }
-    }
-    return promise;
+    var error = response[Protocol.Error];
+    if (!error && !response.exceptionDetails)
+        return InspectorTest.runtimeModel.createRemoteObject(response.result);
+    InspectorTest.addResult("Error: " + (error || response.exceptionDetails && response.exceptionDetails.text || "exception while evaluation in page."));
+    InspectorTest.completeTest();
 }
 
 InspectorTest.callFunctionInPageAsync = function(name, args)
 {
     args = args || [];
     return InspectorTest.evaluateInPageAsync(name + "(" + args.map(JSON.stringify).join(",") + ")");
 }
 
 InspectorTest.evaluateInPageWithTimeout = function(code)
 {
@@ skipping 1188 matching lines @@
     _output("[page] " + text);
 }
 
 function _output(result)
 {
     if (!outputElement)
         createOutputElement();
     outputElement.appendChild(document.createTextNode(result));
     outputElement.appendChild(document.createElement("br"));
 }