DevTools: merge ScriptCallStack and ScriptAsyncCallStack, move CallStacks from console to Runtime.

third_party/WebKit/Source/devtools/front_end/promises/PromisePane.js

Index: third_party/WebKit/Source/devtools/front_end/promises/PromisePane.js
diff --git a/third_party/WebKit/Source/devtools/front_end/promises/PromisePane.js b/third_party/WebKit/Source/devtools/front_end/promises/PromisePane.js
index a2f2fa499f6bbc11af5afc98b399973806054b1a..83300bd956234740bcd6360ead5ccde4089d7b84 100644
--- a/third_party/WebKit/Source/devtools/front_end/promises/PromisePane.js
+++ b/third_party/WebKit/Source/devtools/front_end/promises/PromisePane.js
@@ -600,16 +600,12 @@ WebInspector.PromisePane.prototype = {
         var details = this._promiseDetailsByDebuggerModel.get(this._debuggerModel).get(node.promiseId());
 
         var stackTrace;
-        var asyncStackTrace;
-        if (anchor.classList.contains("created-column")) {
+        if (anchor.classList.contains("created-column"))
             stackTrace = details.creationStack;
-            asyncStackTrace = details.asyncCreationStack;
-        } else {
+        else
             stackTrace = details.settlementStack;
-            asyncStackTrace = details.asyncSettlementStack;
-        }
 
-        var content = WebInspector.DOMPresentationUtils.buildStackTracePreviewContents(this._debuggerModel.target(), this._linkifier, stackTrace, asyncStackTrace);
+        var content = WebInspector.DOMPresentationUtils.buildStackTracePreviewContents(this._debuggerModel.target(), this._linkifier, stackTrace);
         popover.setCanShrink(true);
         popover.showForAnchor(content, anchor);
     },
@@ -690,7 +686,7 @@ WebInspector.PromiseDataGridNode.prototype = {
 
     /**
      * @param {!Element} cell
-     * @param {?ConsoleAgent.CallFrame=} callFrame
+     * @param {?RuntimeAgent.CallFrame=} callFrame
      */
     _appendCallFrameAnchor: function(cell, callFrame)
     {
@@ -739,7 +735,7 @@ WebInspector.PromiseDataGridNode.prototype = {
             break;
 
         case "settled":
-            this._appendCallFrameAnchor(cell, details.settlementStack ? details.settlementStack[0] : null);
+            this._appendCallFrameAnchor(cell, details.settlementStack && details.settlementStack.callFrames.length ? details.settlementStack.callFrames[0] : null);
             break;
 
         case "tts":
@@ -762,7 +758,7 @@ WebInspector.PromiseDataGridNode.prototype = {
     },
 
     /**
-     * @param {?ConsoleAgent.CallFrame=} callFrame
+     * @param {?RuntimeAgent.CallFrame=} callFrame
      * @return {string}
      */
     _callFrameAnchorTextForSearch: function(callFrame)
@@ -784,7 +780,7 @@ WebInspector.PromiseDataGridNode.prototype = {
         var texts = [
             WebInspector.beautifyFunctionName(details.callFrame ? details.callFrame.functionName : ""),
             this._callFrameAnchorTextForSearch(details.callFrame),
-            this._callFrameAnchorTextForSearch(details.settlementStack ? details.settlementStack[0] : null),
+            this._callFrameAnchorTextForSearch(details.settlementStack && details.settlementStack.callFrames.length ? details.settlementStack.callFrames[0] : null),
             this._ttsCellText().replace(/\u2009/g, " ") // \u2009 is a thin space.
         ];
         return texts.join(" ");