Bulk fixes to get Mac Test Shell more compile-happy.

webkit/tools/test_shell/webview_host.h

 // 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.
 
-#ifndef WEBKIT_TOOLS_TEST_SHELL_WEBVIEW_HOST_H__
-#define WEBKIT_TOOLS_TEST_SHELL_WEBVIEW_HOST_H__
+#ifndef WEBKIT_TOOLS_TEST_SHELL_WEBVIEW_HOST_H_
+#define WEBKIT_TOOLS_TEST_SHELL_WEBVIEW_HOST_H_
 
-#include <windows.h>
-
+#include "base/basictypes.h"
+#include "base/gfx/native_widget_types.h"
 #include "base/gfx/rect.h"
 #include "base/scoped_ptr.h"
 #include "webkit/tools/test_shell/webwidget_host.h"
 
 struct WebPreferences;
 class WebView;
 class WebViewDelegate;
 
-// This class is a simple HWND-based host for a WebView
+// This class is a simple ViewHandle-based host for a WebView
 class WebViewHost : public WebWidgetHost {
  public:
-  // The new instance is deleted once the associated HWND is destroyed.  The
-  // newly created window should be resized after it is created, using the
+  // The new instance is deleted once the associated ViewHandle is destroyed.
+  // The newly created window should be resized after it is created, using the
   // MoveWindow (or equivalent) function.
-  static WebViewHost* Create(HWND parent_window,
+  static WebViewHost* Create(gfx::WindowHandle parent_window,
                              WebViewDelegate* delegate,
                              const WebPreferences& prefs);
 
   WebView* webview() const;
 
  protected:
+#if defined(OS_WIN)
   virtual bool WndProc(UINT message, WPARAM wparam, LPARAM lparam) {
     return false;
   }
+#endif
 };
 
-#endif  // WEBKIT_TOOLS_TEST_SHELL_WEBVIEW_HOST_H__
-
+#endif  // WEBKIT_TOOLS_TEST_SHELL_WEBVIEW_HOST_H_