Chromium Code Reviews| Index: LayoutTests/http/tests/inspector/debugger-test.js |
| diff --git a/LayoutTests/http/tests/inspector/debugger-test.js b/LayoutTests/http/tests/inspector/debugger-test.js |
| index d380e35e23cf5c9d9068ba64e094359367cf184d..e0cd893f498bb2b3f62beca242c0b12244f07bdb 100644 |
| --- a/LayoutTests/http/tests/inspector/debugger-test.js |
| +++ b/LayoutTests/http/tests/inspector/debugger-test.js |
| @@ -6,49 +6,15 @@ InspectorTest.startDebuggerTest = function(callback, quiet) |
| InspectorTest._quiet = quiet; |
| WebInspector.inspectorView.showPanel("sources"); |
|
yurys
2014/06/06 08:59:58
Let's add an assert that WebInspector.debuggerMode
loislo
2014/06/06 12:41:12
Done.
|
| - if (WebInspector.debuggerModel.debuggerEnabled()) |
| - startTest(); |
| - else { |
| - InspectorTest.addSniffer(WebInspector.debuggerModel, "_debuggerWasEnabled", startTest); |
| - WebInspector.debuggerModel.enableDebugger(); |
| - } |
| - |
| - function startTest() |
| - { |
| - InspectorTest.addResult("Debugger was enabled."); |
| - InspectorTest.addSniffer(WebInspector.debuggerModel, "_pausedScript", InspectorTest._pausedScript, true); |
| - InspectorTest.addSniffer(WebInspector.debuggerModel, "_resumedScript", InspectorTest._resumedScript, true); |
| - InspectorTest.safeWrap(callback)(); |
| - } |
| -}; |
| - |
| -InspectorTest.finishDebuggerTest = function(callback) |
| -{ |
| - var sourcesPanel = WebInspector.panels.sources; |
| - |
| - WebInspector.debuggerModel.setBreakpointsActive(true); |
| - InspectorTest.resumeExecution(disableDebugger); |
| - |
| - function disableDebugger() |
| - { |
| - if (!WebInspector.debuggerModel.debuggerEnabled()) |
| - completeTest(); |
| - else { |
| - InspectorTest.addSniffer(WebInspector.debuggerModel, "_debuggerWasDisabled", debuggerDisabled); |
| - WebInspector.debuggerModel.disableDebugger(); |
| - } |
| - } |
| - |
| - function debuggerDisabled() |
| - { |
| - InspectorTest.addResult("Debugger was disabled."); |
| - callback(); |
| - } |
| + InspectorTest.addSniffer(WebInspector.debuggerModel, "_pausedScript", InspectorTest._pausedScript, true); |
| + InspectorTest.addSniffer(WebInspector.debuggerModel, "_resumedScript", InspectorTest._resumedScript, true); |
| + InspectorTest.safeWrap(callback)(); |
| }; |
| InspectorTest.completeDebuggerTest = function() |
| { |
| - InspectorTest.finishDebuggerTest(InspectorTest.completeTest.bind(InspectorTest)); |
| + WebInspector.debuggerModel.setBreakpointsActive(true); |
| + InspectorTest.resumeExecution(InspectorTest.completeTest.bind(InspectorTest)); |
| }; |
| InspectorTest.runDebuggerTestSuite = function(testSuite) |