linux: cleanup browser-side GtkSockets when plugins are destroyed

WillDestroyWindow is already plumbed over to the browser process in the
multiproc case; we want to plumb it to our RenderView delegate so we
can do similar cleanup in test_shell.

BUG=15423

Review URL: http://codereview.chromium.org/147251

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19475 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 5 deletions

diff --git a/webkit/glue/plugins/webplugin_delegate_impl_gtk.cc b/webkit/glue/plugins/webplugin_delegate_impl_gtk.cc
index 49670fc..c20fee0 100644
--- a/webkit/glue/plugins/webplugin_delegate_impl_gtk.cc
+++ b/webkit/glue/plugins/webplugin_delegate_impl_gtk.cc
@@ -266,8 +266,8 @@ bool WebPluginDelegateImpl::WindowedCreatePlugin() {
   window_.window = reinterpret_cast<void*>(parent_);
   // The remainder of the code expects windowed_handle_ to exist for
   // windowed mode, despite not actually ever reaching through
-  // windowed_handle_.  So let's set it to the one window handle we
-  // actually have available.
+  // windowed_handle_.  It is still used as a token to represent "this
+  // plugin" in messages to the browser.
   windowed_handle_ = parent_;
 
   if (!window_.ws_info)
@@ -283,9 +283,11 @@ bool WebPluginDelegateImpl::WindowedCreatePlugin() {
 }
 
 void WebPluginDelegateImpl::WindowedDestroyWindow() {
-  // We have no window to destroy; see comment in WindowedCreatePlugin
-  // where windowed_handle_ is set.
-  windowed_handle_ = 0;
+  if (windowed_handle_) {
+    plugin_->WillDestroyWindow(windowed_handle_);
+
+    windowed_handle_ = 0;
+  }
 }
 
 bool WebPluginDelegateImpl::WindowedReposition(