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

third_party/WebKit/Source/devtools/front_end/sources/AsyncOperationsSidebarPane.js

Index: third_party/WebKit/Source/devtools/front_end/sources/AsyncOperationsSidebarPane.js
diff --git a/third_party/WebKit/Source/devtools/front_end/sources/AsyncOperationsSidebarPane.js b/third_party/WebKit/Source/devtools/front_end/sources/AsyncOperationsSidebarPane.js
index e04d60dddc03863224634bccd39ebf43ecb3ef51..9b9365febfa47d60540b4e1cde6e2f5cf8155f31 100644
--- a/third_party/WebKit/Source/devtools/front_end/sources/AsyncOperationsSidebarPane.js
+++ b/third_party/WebKit/Source/devtools/front_end/sources/AsyncOperationsSidebarPane.js
@@ -279,12 +279,17 @@ WebInspector.AsyncOperationsSidebarPane.prototype = {
     {
         var element = createElementWithClass("li", "async-operation");
 
-        var title = operation.description || WebInspector.UIString("Async Operation");
+        var title;
+        if (operation.stack)
+            title = operation.stack.description;
+        if (!title)
+            title = WebInspector.UIString("Async Operation");
+
         var label = createCheckboxLabel(title, operation[this._checkedSymbol]);
         label.checkboxElement.addEventListener("click", this._checkboxClicked.bind(this, operation.id), false);
         element.appendChild(label);
         var debuggerModel = WebInspector.DebuggerModel.fromTarget(this._target);
-        var callFrame = WebInspector.DebuggerPresentationUtils.callFrameAnchorFromStackTrace(debuggerModel, operation.stackTrace, operation.asyncStackTrace, this._revealBlackboxedCallFrames);
+        var callFrame = WebInspector.DebuggerPresentationUtils.callFrameAnchorFromStackTrace(debuggerModel, operation.stack, this._revealBlackboxedCallFrames);
         if (callFrame)
             element.createChild("div").appendChild(this._linkifier.linkifyConsoleCallFrame(this._target, callFrame));
 
@@ -353,7 +358,7 @@ WebInspector.AsyncOperationsSidebarPane.prototype = {
         var operation = this._operationForPopover(anchor);
         if (!operation)
             return;
-        var content = WebInspector.DOMPresentationUtils.buildStackTracePreviewContents(this._target, this._linkifier, operation.stackTrace, operation.asyncStackTrace);
+        var content = WebInspector.DOMPresentationUtils.buildStackTracePreviewContents(this._target, this._linkifier, operation.stack);
         popover.setCanShrink(true);
         popover.showForAnchor(content, anchor);
     },
@@ -372,7 +377,7 @@ WebInspector.AsyncOperationsSidebarPane.prototype = {
             return null;
         var operationId = anchor[this._operationIdSymbol];
         var operation = operationId && asyncOperations.get(operationId);
-        if (!operation || !operation.stackTrace)
+        if (!operation || !operation.stack)
             return null;
         return operation;
     },