Fixes bug in test shell. We were invoking ResetTestController before...

webkit/tools/test_shell/test_shell_win.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include <windows.h>
 #include <atlbase.h>
 #include <commdlg.h>
 #include <objbase.h>
@@ skipping 213 matching lines @@
 
   // Load the test file into the first available window.
   if (TestShell::windowList()->empty()) {
     LOG(ERROR) << "No windows open.";
     return false;
   }
 
   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 comments below
ResetTestController?

   shell = static_cast<TestShell*>(win_util::GetWindowUserData(hwnd));
   DCHECK(shell);
 
   // Clear focus between tests.
   shell->m_focusedWidgetHost = NULL;
 
   // Make sure the previous load is stopped.
   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();
   shell->webView()->SetPreferences(*web_prefs_);
 
   SetWindowPos(shell->m_mainWnd, NULL,
                kTestWindowXLocation, kTestWindowYLocation, 0, 0,
                SWP_NOSIZE | SWP_NOZORDER);
   shell->ResizeSubViews();
 
@@ skipping 488 matching lines @@
 
 bool EnsureFontLoaded(HFONT font) {
   return true;
 }
 
 bool DownloadUrl(const std::string& url, HWND caller_window) {
   return false;
 }
 
 }  // namespace webkit_glue