Handle destruction of test shell properly.

webkit/tools/test_shell/test_shell_gtk.cc

Index: webkit/tools/test_shell/test_shell_gtk.cc
diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc
index fa093465348ef7c111a05a7a208356517639756a..35b4e690089840fa864d55d11851fe14019b9b34 100644
--- a/webkit/tools/test_shell/test_shell_gtk.cc
+++ b/webkit/tools/test_shell/test_shell_gtk.cc
@@ -135,13 +135,17 @@ bool TestShell::CreateNewWindow(const std::wstring& startingURL,
 }
 
 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()) {
@@ -150,6 +154,8 @@ void MainWindowDestroyed(GtkWindow* window, TestShell* shell) {
   }
 
   delete shell;
+
+  return FALSE;  // Don't stop this message.
 }
 
 // Callback for when you click the back button.