| Index: LayoutTests/inspector/debugger/set-breakpoint.html
 | 
| diff --git a/LayoutTests/inspector/debugger/set-breakpoint.html b/LayoutTests/inspector/debugger/set-breakpoint.html
 | 
| index 82cebadcb4095aa178c0308a35a97e1681bb0935..f8a571e634c8270dfe113a0cbf5af854b464efea 100644
 | 
| --- a/LayoutTests/inspector/debugger/set-breakpoint.html
 | 
| +++ b/LayoutTests/inspector/debugger/set-breakpoint.html
 | 
| @@ -31,8 +31,8 @@ var test = function()
 | 
|              {
 | 
|                  currentSourceFrame = sourceFrame;
 | 
|                  InspectorTest.addResult("Script source was shown.");
 | 
| -                InspectorTest.setBreakpoint(currentSourceFrame, 16, "", true);
 | 
| -                InspectorTest.runTestFunctionAndWaitUntilPaused(didPause);
 | 
| +                setBreakpointAndWaitUntilPaused(currentSourceFrame, 16, didPause);
 | 
| +                InspectorTest.runTestFunction();
 | 
|              }
 | 
|  
 | 
|              function didPause(callFrames)
 | 
| @@ -64,8 +64,7 @@ var test = function()
 | 
|              function didShowScriptSource(sourceFrame)
 | 
|              {
 | 
|                  currentSourceFrame = sourceFrame;
 | 
| -                InspectorTest.setBreakpoint(currentSourceFrame, 6, "", true);
 | 
| -                InspectorTest.waitUntilPaused(didPause);
 | 
| +                setBreakpointAndWaitUntilPaused(currentSourceFrame, 6, didPause);
 | 
|                  InspectorTest.evaluateInPage("setTimeout(oneLineTestFunction, 0)");
 | 
|              }
 | 
|  
 | 
| @@ -124,6 +123,28 @@ var test = function()
 | 
|          InspectorTest.addResult("Dump breakpoint sidebar pane:");
 | 
|          InspectorTest.addResult(InspectorTest.textContentWithLineBreaks(paneElement));
 | 
|      }
 | 
| +
 | 
| +    function setBreakpointAndWaitUntilPaused(sourceFrame, lineNumber, pausedCallback)
 | 
| +    {
 | 
| +        var expectedBreakpointId;
 | 
| +        InspectorTest.addSniffer(WebInspector.BreakpointManager.Breakpoint.prototype, "_didSetBreakpointInDebugger", didSetBreakpointInDebugger);
 | 
| +        InspectorTest.setBreakpoint(sourceFrame, lineNumber, "", true);
 | 
| +
 | 
| +        function didSetBreakpointInDebugger(breakpointId)
 | 
| +        {
 | 
| +            expectedBreakpointId = breakpointId;
 | 
| +            InspectorTest.waitUntilPaused(didPause);
 | 
| +        }
 | 
| +
 | 
| +        function didPause(callFrames, reason, breakpointIds)
 | 
| +        {
 | 
| +            InspectorTest.assertEquals(breakpointIds.length, 1);
 | 
| +            InspectorTest.assertEquals(breakpointIds[0], expectedBreakpointId);
 | 
| +            InspectorTest.assertEquals(reason, "other");
 | 
| +
 | 
| +            pausedCallback(callFrames);
 | 
| +        }
 | 
| +    }
 | 
|  }
 | 
|  
 | 
|  </script>
 | 
| 
 |