Chromium Code Reviews| Index: webkit/tools/test_shell/test_shell_win.cc |
| =================================================================== |
| --- webkit/tools/test_shell/test_shell_win.cc (revision 10292) |
| +++ webkit/tools/test_shell/test_shell_win.cc (working copy) |
| @@ -231,10 +231,7 @@ |
| HWND hwnd = *(TestShell::windowList()->begin()); |
| TestShell* shell = |
| static_cast<TestShell*>(win_util::GetWindowUserData(hwnd)); |
| - shell->ResetTestController(); |
| - // ResetTestController may have closed the window we were holding on to. |
| - // Grab the first window again. |
| hwnd = *(TestShell::windowList()->begin()); |
|
tony
2009/02/24 23:33:45
Nit: Should we move these three lines and the comm
|
| shell = static_cast<TestShell*>(win_util::GetWindowUserData(hwnd)); |
| DCHECK(shell); |
| @@ -246,6 +243,11 @@ |
| shell->webView()->StopLoading(); |
| shell->navigation_controller()->Reset(); |
| + // StopLoading may update state maintained in the test controller (for |
| + // example, whether the WorkQueue is frozen) as such, we need to reset it |
| + // after we invoke StopLoading. |
| + shell->ResetTestController(); |
| + |
| // Clean up state between test runs. |
| webkit_glue::ResetBeforeTestRun(shell->webView()); |
| ResetWebPreferences(); |