Merge DevTools Refactor CL to Blink36

LayoutTests/dart/inspector/scope-variables.html

Index: LayoutTests/dart/inspector/scope-variables.html
diff --git a/LayoutTests/dart/inspector/scope-variables.html b/LayoutTests/dart/inspector/scope-variables.html
index 8e225b289c644a66dbf272d28852c82113ece1c0..7e5d8de814aacaf3bc812788ba0b9e7b1c3aee92 100644
--- a/LayoutTests/dart/inspector/scope-variables.html
+++ b/LayoutTests/dart/inspector/scope-variables.html
@@ -11,8 +11,13 @@ function postMessageToDart()
     window.postMessage('fromJS', '*');
 }
 
+function testFunction() {
+    postMessageToDart();
+}
+
 function test()
 {
+    var panel = WebInspector.inspectorView.showPanel("sources");
     InspectorTest.runDebuggerTestSuite([
         function testScopeChain(next)
         {
@@ -27,8 +32,7 @@ function test()
             function didAddBreakpoint(lineNumber)
             {
                 InspectorTest.addResult("Breakpoint added to source frame at line " + lineNumber);
-                InspectorTest.waitUntilPaused(didPauseInDart);
-                InspectorTest.evaluateInPage('postMessageToDart()');
+                InspectorTest.runTestFunctionAndWaitUntilPaused(didPauseInDart);
             }
 
             function didPauseInDart(callFrames)