Reverting 19560. This caused a bunch of plugin-related unittest failures on Windows.

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

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

2 files changed, 3 insertions, 11 deletions

diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index 221943e..1b5a99e 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -89,7 +89,6 @@ class TestWebViewDelegate : public base::RefCounted<TestWebViewDelegate>,
     const std::string& clsid,
     std::string* actual_mime_type);
 #if defined(OS_LINUX)
-  virtual gfx::PluginWindowHandle CreatePluginContainer();
   virtual void WillDestroyPluginWindow(gfx::PluginWindowHandle handle);
 #endif
   virtual WebKit::WebMediaPlayer* CreateWebMediaPlayer(
diff --git a/webkit/tools/test_shell/test_webview_delegate_gtk.cc b/webkit/tools/test_shell/test_webview_delegate_gtk.cc
index 10ba40f..cd21c17 100644
--- a/webkit/tools/test_shell/test_webview_delegate_gtk.cc
+++ b/webkit/tools/test_shell/test_webview_delegate_gtk.cc
@@ -7,7 +7,6 @@
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
 #include <gtk/gtk.h>
-#include <gdk/gdkx.h>
 
 #include "base/gfx/gtk_util.h"
 #include "base/gfx/point.h"
@@ -92,18 +91,13 @@ WebPluginDelegate* TestWebViewDelegate::CreatePluginDelegate(
   const std::string& mtype =
       (actual_mime_type && !actual_mime_type->empty()) ? *actual_mime_type
                                                        : mime_type;
-  // TODO(evanm): we probably shouldn't be doing this mapping to X ids at
-  // this level.
+
   GdkNativeWindow plugin_parent =
-      GDK_WINDOW_XWINDOW(shell_->webViewHost()->view_handle()->window);
+      shell_->webViewHost()->CreatePluginContainer();
 
   return WebPluginDelegateImpl::Create(info.path, mtype, plugin_parent);
 }
 
-gfx::PluginWindowHandle TestWebViewDelegate::CreatePluginContainer() {
-  return shell_->webViewHost()->CreatePluginContainer();
-}
-
 void TestWebViewDelegate::WillDestroyPluginWindow(unsigned long id) {
   shell_->webViewHost()->OnPluginWindowDestroyed(id);
 }
@@ -238,8 +232,7 @@ void TestWebViewDelegate::DidMove(WebWidget* webwidget,
   // window?), ignore the message.
   if (!widget)
     return;
-  DCHECK(!GTK_WIDGET_NO_WINDOW(widget));
-  DCHECK(GTK_WIDGET_REALIZED(widget));
+  DCHECK(!GTK_WIDGET_NO_WINDOW(widget) && GTK_WIDGET_REALIZED(widget));
 
   if (!move.visible) {
     gtk_widget_hide(widget);