[DevTools] InspectorTest.evaluateInPageAsync uses Runtime.evaluate

third_party/WebKit/LayoutTests/http/tests/inspector-protocol/resources/protocol-test.html

 <!--
 Copyright (C) 2012 Samsung Electronics. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
 
 1.  Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 265 matching lines @@
 InspectorTest.evaluateInPage = function(string, callback)
 {
     this.sendCommand("Runtime.evaluate", { "expression": string }, function(message) {
         if (message.error)
             InspectorTest.log("Error while executing '" + string + "': " + message.error.message);
         else if (callback)
             callback(message.result.result.value);
     });
 };
 
-InspectorTest._asyncCallbacks = {};
-InspectorTest._asyncCallbackId = 0;
-
-InspectorTest.evaluateInPageAsync = function(string, callback)
+InspectorTest.evaluateInPageAsync = function(expression)
 {
-    var id = ++InspectorTest._asyncCallbackId;
-    InspectorTest._asyncCallbacks[id] = callback;
-    var callbackString = "testRunner.evaluateInWebInspector.bind(testRunner, 42, \"InspectorTest._evaluateInPageAsyncCompleted(" + id + ")\")";
-    var code = string.replace("%callback", callbackString);
-    InspectorTest.evaluateInPage(code);
-};
-
-InspectorTest._evaluateInPageAsyncCompleted = function(id)
-{
-    var callback = InspectorTest._asyncCallbacks[id];
-    delete InspectorTest._asyncCallbacks[id];
-    if (!callback) {
-        InspectorTest.log("Error: no callback for async function");
-        InspectorTest.completeTest();
-        return;
-    }
-    callback();
+    return InspectorTest.sendCommandPromise("Runtime.evaluate", { "expression": expression, awaitPromise: true }).then((message) => message.result.result.value);
 }
 
 InspectorTest.completeTestIfError = function(messageObject)
 {
     if (messageObject.error) {
         InspectorTest.log(messageObject.error.message);
         InspectorTest.completeTest();
         return true;
     }
     return false;
@@ skipping 112 matching lines @@
     var callback = didResolve ? callbacks.resolve : callbacks.reject;
     delete pendingPromiseEvalRequests[callId];
     callback(value);
 }
 
 window.addEventListener("load", InspectorTest.readyForTest.bind(InspectorTest), false);
 
 </script>
 </head>
 </html>