4 files changed, 13 insertions, 14 deletions
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index 6224b9c..971f199 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -77,8 +77,8 @@ class TestWebViewDelegate : public WebViewDelegate {
       const std::string& clsid,
       std::string* actual_mime_type);
 #if defined(OS_LINUX)
-  virtual gfx::PluginWindowHandle CreatePluginContainer();
-  virtual void WillDestroyPluginWindow(gfx::PluginWindowHandle handle);
+  virtual void CreatedPluginWindow(gfx::PluginWindowHandle id);
+  virtual void WillDestroyPluginWindow(gfx::PluginWindowHandle id);
 #endif
   virtual WebKit::WebMediaPlayer* CreateWebMediaPlayer(
       WebKit::WebMediaPlayerClient* client);
diff --git a/webkit/tools/test_shell/test_webview_delegate_gtk.cc b/webkit/tools/test_shell/test_webview_delegate_gtk.cc
index 460dceb..461d1d3 100644
--- a/webkit/tools/test_shell/test_webview_delegate_gtk.cc
+++ b/webkit/tools/test_shell/test_webview_delegate_gtk.cc
@@ -108,12 +108,12 @@ WebPluginDelegate* TestWebViewDelegate::CreatePluginDelegate(
   return WebPluginDelegateImpl::Create(info.path, mtype, plugin_parent);
 }
 
-gfx::PluginWindowHandle TestWebViewDelegate::CreatePluginContainer() {
-  return shell_->webViewHost()->CreatePluginContainer();
+void TestWebViewDelegate::CreatedPluginWindow(gfx::PluginWindowHandle id) {
+  shell_->webViewHost()->CreatePluginContainer(id);
 }
 
-void TestWebViewDelegate::WillDestroyPluginWindow(unsigned long id) {
-  shell_->webViewHost()->OnPluginWindowDestroyed(id);
+void TestWebViewDelegate::WillDestroyPluginWindow(gfx::PluginWindowHandle id) {
+  shell_->webViewHost()->DestroyPluginContainer(id);
 }
 
 void TestWebViewDelegate::ShowJavaScriptAlert(const std::wstring& message) {
diff --git a/webkit/tools/test_shell/webview_host.h b/webkit/tools/test_shell/webview_host.h
index 962633b..3c95e1d 100644
--- a/webkit/tools/test_shell/webview_host.h
+++ b/webkit/tools/test_shell/webview_host.h
@@ -32,12 +32,11 @@ class WebViewHost : public WebWidgetHost {
   WebView* webview() const;
 
 #if defined(OS_LINUX)
-  // Create a new plugin parent container, returning its X window id for
-  // embedders to use.
-  GdkNativeWindow CreatePluginContainer();
+  // Create a new plugin parent container for a given plugin XID.
+  void CreatePluginContainer(gfx::PluginWindowHandle id);
 
-  // Called when a plugin has been destroyed.  Lets us clean up our side.
-  void OnPluginWindowDestroyed(GdkNativeWindow id);
+  // Destroy the plugin parent container when a plugin has been destroyed.
+  void DestroyPluginContainer(gfx::PluginWindowHandle id);
 
   GtkPluginContainerManager* plugin_container_manager() {
     return &plugin_container_manager_;
diff --git a/webkit/tools/test_shell/webview_host_gtk.cc b/webkit/tools/test_shell/webview_host_gtk.cc
index 39a88ab..6554cc5 100644
--- a/webkit/tools/test_shell/webview_host_gtk.cc
+++ b/webkit/tools/test_shell/webview_host_gtk.cc
@@ -35,10 +35,10 @@ WebView* WebViewHost::webview() const {
   return static_cast<WebView*>(webwidget_);
 }
 
-GdkNativeWindow WebViewHost::CreatePluginContainer() {
-  return plugin_container_manager_.CreatePluginContainer();
+void WebViewHost::CreatePluginContainer(gfx::PluginWindowHandle id) {
+  plugin_container_manager_.CreatePluginContainer(id);
 }
 
-void WebViewHost::OnPluginWindowDestroyed(GdkNativeWindow id) {
+void WebViewHost::DestroyPluginContainer(gfx::PluginWindowHandle id) {
   plugin_container_manager_.DestroyPluginContainer(id);
 }