test_shell_gtk: applies the same change as test_shell_win from http://codereview.chromium.org/27109

webkit/tools/test_shell/test_shell_gtk.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 <errno.h>
 #include <fcntl.h>
 #include <fontconfig/fontconfig.h>
 #include <gtk/gtk.h>
@@ skipping 488 matching lines @@
 /* static */ bool TestShell::RunFileTest(const TestParams& params) {
   // Load the test file into the first available window.
   if (TestShell::windowList()->empty()) {
     LOG(ERROR) << "No windows open.";
     return false;
   }
 
   GtkWindow* window = *(TestShell::windowList()->begin());
   TestShell* shell =
       static_cast<TestShell*>(g_object_get_data(G_OBJECT(window), "test-shell"));
-  shell->ResetTestController();
-
-  // ResetTestController may have closed the window we were holding on to.
-  // Grab the first window again.
-  window = *(TestShell::windowList()->begin());
-  shell = static_cast<TestShell*>(g_object_get_data(G_OBJECT(window), "test-shell"));
-  DCHECK(shell);
 
   // Clear focus between tests.
   shell->m_focusedWidgetHost = NULL;
 
   // Make sure the previous load is stopped.
   shell->webView()->mainFrame()->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();
+
+  // ResetTestController may have closed the window we were holding on to.
+  // Grab the first window again.
+  window = *(TestShell::windowList()->begin());

[agl, 2010/05/27 14:30:40]

in CL 27109, grabbing the window again occurs before ResetTestController. I
don't really know what's going on here, but if there's a reason that Windows and
Linux differ in this respect then it should probably be commented.

[bulach, 2010/05/27 14:42:26]

ops, sorry, I should've clarified: sky addressed tony's comments on CL 27109,
this is what was actually submitted:

http://src.chromium.org/viewvc/chrome/trunk/src/webkit/tools/test_shell/test_...


so this change is identical to windows.

+  shell = static_cast<TestShell*>(g_object_get_data(G_OBJECT(window),
+                                                    "test-shell"));
+  DCHECK(shell);
+
   // Clean up state between test runs.
   webkit_glue::ResetBeforeTestRun(shell->webView());
   ResetWebPreferences();
   web_prefs_->Apply(shell->webView());
 
   // TODO(agl): Maybe make the window hidden in the future. Window does this
   // by positioning it off the screen but the GTK function to do this is
   // deprecated and appears to have been removed.
 
   shell->ResizeSubViews();
@@ skipping 114 matching lines @@
       break;
   }
   return TestShell::NetResourceProvider(resource_id);
 }
 
 void GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) {
   NPAPI::PluginList::Singleton()->GetPlugins(refresh, plugins);
 }
 
 }  // namespace webkit_glue