Merge DevTools Refactor CL to Blink36

LayoutTests/dart/inspector/debugger-code-in-html.html

Index: LayoutTests/dart/inspector/debugger-code-in-html.html
diff --git a/LayoutTests/dart/inspector/debugger-code-in-html.html b/LayoutTests/dart/inspector/debugger-code-in-html.html
index e6e36639ab1082c2a89933740fd9fd565919b048..628efe872f7b8f19bdbf4464cde8acfd1452643b 100644
--- a/LayoutTests/dart/inspector/debugger-code-in-html.html
+++ b/LayoutTests/dart/inspector/debugger-code-in-html.html
@@ -28,6 +28,10 @@ function postMessageToDart()
     window.postMessage('fromJS', '*');
 }
 
+function testFunction() {
+    postMessageToDart();
+}
+
 function handleReplyFromDart(event)
 {
     if (event.data == 'fromDart')
@@ -49,8 +53,7 @@ function test()
             function didShowScriptSource(sourceFrame)
             {
                 InspectorTest.setBreakpoint(sourceFrame, 19, '', true);
-                InspectorTest.waitUntilPaused(didPauseInDart);
-                InspectorTest.evaluateInPage('postMessageToDart()');
+                InspectorTest.runTestFunctionAndWaitUntilPaused(didPauseInDart);
             }
 
             function didPauseInDart(callFrames)
@@ -77,8 +80,7 @@ function test()
             function didShowScriptSource(sourceFrame)
             {
                 InspectorTest.removeBreakpoint(sourceFrame, 19);
-                InspectorTest.waitUntilPaused(didPause);
-                InspectorTest.evaluateInPage('postMessageToDart()');
+                InspectorTest.runTestFunctionAndWaitUntilPaused(didPauseInDart);
             }
 
             function didPause(callFrames)