Handle destruction of test shell properly.

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 117 matching lines @@
   TestShell *shell = new TestShell();
   if (!shell->Initialize(startingURL))
     return false;
   if (result)
     *result = shell;
   TestShell::windowList()->push_back(shell->m_mainWnd);
   return true;
 }
 
 void TestShell::PlatformCleanUp() {
+  // The GTK widgets will be destroyed, which will free the associated
+  // objects.  So we don't need the scoped_ptr to free the webViewHost.
+  m_webViewHost.release();
 }
 
 // GTK callbacks ------------------------------------------------------
 namespace {
 
 // Callback for when the main window is destroyed.
-void MainWindowDestroyed(GtkWindow* window, TestShell* shell) {
+gboolean MainWindowDestroyed(GtkWindow* window, TestShell* shell) {
+
   TestShell::RemoveWindowFromList(GTK_WIDGET(window));
 
   if (TestShell::windowList()->empty() || shell->is_modal()) {
     MessageLoop::current()->PostTask(FROM_HERE,
                                      new MessageLoop::QuitTask());
   }
 
   delete shell;
+
+  return FALSE;  // Don't stop this message.
 }
 
 // Callback for when you click the back button.
 void BackButtonClicked(GtkButton* button, TestShell* shell) {
   shell->GoBackOrForward(-1);
 }
 
 // Callback for when you click the forward button.
 void ForwardButtonClicked(GtkButton* button, TestShell* shell) {
   shell->GoBackOrForward(1);
@@ skipping 548 matching lines @@
   // of NOTIMPLEMENTED into our layout test diffs.
   // NOTIMPLEMENTED();
   return false;
 }
 
 ScreenInfo GetScreenInfo(gfx::ViewHandle window) {
   return GetScreenInfoHelper(window);
 }
 
 }  // namespace webkit_glue