Reverting 20855.

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

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

1 files changed, 5 insertions, 6 deletions

diff --git a/webkit/tools/test_shell/webwidget_host.h b/webkit/tools/test_shell/webwidget_host.h
index e74638e..2fc2a10 100644
--- a/webkit/tools/test_shell/webwidget_host.h
+++ b/webkit/tools/test_shell/webwidget_host.h
@@ -11,14 +11,13 @@
 #include "base/scoped_ptr.h"
 #include "skia/ext/platform_canvas.h"
 
-class WebWidget;
-class WebWidgetDelegate;
-
 namespace gfx {
 class Size;
 }
 
 namespace WebKit {
+class WebWidget;
+class WebWidgetClient;
 struct WebScreenInfo;
 }
 
@@ -37,14 +36,14 @@ class WebWidgetHost {
   // The newly created window should be resized after it is created, using the
   // MoveWindow (or equivalent) function.
   static WebWidgetHost* Create(gfx::NativeView parent_view,
-                               WebWidgetDelegate* delegate);
+                               WebKit::WebWidgetClient* client);
 
 #if defined(OS_MACOSX)
   static void HandleEvent(gfx::NativeView view, NSEvent* event);
 #endif
 
   gfx::NativeView view_handle() const { return view_; }
-  WebWidget* webwidget() const { return webwidget_; }
+  WebKit::WebWidget* webwidget() const { return webwidget_; }
 
   void DidInvalidateRect(const gfx::Rect& rect);
   void DidScrollRect(int dx, int dy, const gfx::Rect& clip_rect);
@@ -115,7 +114,7 @@ class WebWidgetHost {
   }
 
   gfx::NativeView view_;
-  WebWidget* webwidget_;
+  WebKit::WebWidget* webwidget_;
   scoped_ptr<skia::PlatformCanvas> canvas_;
 
   // specifies the portion of the webwidget that needs painting