linux: cleanup browser-side GtkSockets when plugins are destroyed

webkit/tools/test_shell/webview_host_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 <gtk/gtk.h>
 
 #include "webkit/tools/test_shell/webview_host.h"
 
 #include "base/logging.h"
 #include "base/gfx/rect.h"
@@ skipping 40 matching lines @@
   NativeWindowToWidgetMap::const_iterator i =
       native_window_to_widget_map_.find(id);
   if (i != native_window_to_widget_map_.end())
     return i->second;
 
   LOG(ERROR) << "Request for widget host for unknown window id " << id;
 
   return NULL;
 }
 
-gboolean WebViewHost::OnPlugRemoved(GtkSocket* socket) {
-  // Remove the socket's id from our list of widgets.
-  GdkNativeWindow id = gtk_socket_get_id(socket);
+void WebViewHost::OnPluginWindowDestroyed(GdkNativeWindow id) {
+  GtkWidget* plugin_container = MapIDToWidget(id);
+  if (!plugin_container)
+    return;
+
   native_window_to_widget_map_.erase(id);
-
-  return FALSE;  // Destroy our widget.
+  gtk_widget_destroy(plugin_container);
 }
 
+gboolean WebViewHost::OnPlugRemoved(GtkSocket* socket) {
+  return TRUE;  // Don't destroy our widget; we manage it ourselves.
+}
+