Support merged Dart-JS callstacks

LayoutTests/dart/inspector/merged-callstack.html

Index: LayoutTests/dart/inspector/merged-callstack.html
diff --git a/LayoutTests/dart/inspector/scope-variables.html b/LayoutTests/dart/inspector/merged-callstack.html
similarity index 66%
copy from LayoutTests/dart/inspector/scope-variables.html
copy to LayoutTests/dart/inspector/merged-callstack.html
index 03bfbd18fae8e29bbc43f917324b9825855cc320..283ddfe8bd53534a8e15d6da53a409f803817a21 100644
--- a/LayoutTests/dart/inspector/scope-variables.html
+++ b/LayoutTests/dart/inspector/merged-callstack.html
@@ -2,7 +2,8 @@
 <script src="../../http/tests/inspector/inspector-test.js"></script>
 <script src="../../http/tests/inspector/debugger-test.js"></script>
 
-<script type="application/dart" src="scope-variables.dart"></script>
+<script type="application/dart" src="merged-callstack.dart"></script>
+<script src="merged-callstack.js"></script>
 
 <script>
 
@@ -21,11 +22,11 @@ function test()
     InspectorTest.runDebuggerTestSuite([
         function testScopeChain(next)
         {
-            InspectorTest.showScriptSource('scope-variables.dart', didShowScriptSource);
+            InspectorTest.showScriptSource('merged-callstack.dart', didShowScriptSource);
 
             function didShowScriptSource(sourceFrame)
             {
-                setBreakpointAndWaitUntilPaused(sourceFrame, 23, didPauseInDart);
+                setBreakpointAndWaitUntilPaused(sourceFrame, 25, didPauseInDart);
                 InspectorTest.runTestFunction();
             }
 
@@ -39,32 +40,6 @@ function test()
             function didExpandScopeChainSections()
             {
                 dumpScopeChainContents();
-                var sections = WebInspector.inspectorView.currentPanel().sidebarPanes.scopechain._sections;
-                for (var s = 0; s < sections.length; s++) {
-                    var section = sections[s];
-
-                    var properties = section.propertiesForTest;
-                    for (var i = 0; i < properties.length; ++i) {
-                        if (properties[i].name == 'a1') {
-                            var objectId = properties[i].value._objectId;
-                            RuntimeAgent.callFunctionOn(objectId, "(){return this.toString();}", [], undefined, didCallFunctionOn);
-                            RuntimeAgent.callFunctionOn(objectId, "function(){return this.toString();}", [], undefined, didCallInvalidFunctionOn);
-                            break;
-                        }
-                    }
-                if (!section.expanded)
-                    InspectorTest.addResult("    <section collapsed>");
-                }
-            }
-
-            function didCallFunctionOn(error, result, wasThrown)
-            {
-                InspectorTest.addResult("Inspected value toString(): " + result.value);
-                InspectorTest.resumeExecution(next);
-            }
-            function didCallInvalidFunctionOn(error, result, wasThrown)
-            {
-                InspectorTest.addResult("Result of calling invalid function. value: " + result.value + ". exception thrown: " + wasThrown);
                 InspectorTest.resumeExecution(next);
             }
         }