Use WebWidget from the WebKit API. This change also makes...

webkit/tools/test_shell/test_shell_mac.mm

 // 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.
 
 #include <ApplicationServices/ApplicationServices.h>
 #import <Cocoa/Cocoa.h>
 #import <objc/objc-runtime.h>
 #include <sys/stat.h>
 
 #include "webkit/tools/test_shell/test_shell.h"
@@ skipping 15 matching lines @@
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "grit/webkit_resources.h"
 #include "net/base/mime_util.h"
 #include "skia/ext/bitmap_platform_device.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/webframe.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/webview.h"
-#include "webkit/glue/webwidget.h"
 #include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/tools/test_shell/mac/test_shell_webview.h"
 #include "webkit/tools/test_shell/resource.h"
 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 
 #include "third_party/skia/include/core/SkBitmap.h"
 
 #import "mac/DumpRenderTreePasteboard.h"
 
+using WebKit::WebWidget;
+
 #define MAX_LOADSTRING 100
 
 // Sizes for URL bar layout
 #define BUTTON_HEIGHT 22
 #define BUTTON_WIDTH 72
 #define BUTTON_MARGIN 8
 #define URLBAR_HEIGHT  32
 
 // Global Variables:
 
@@ skipping 394 matching lines @@
   DCHECK(windowDelegate);
   [windowHandle setDelegate:nil];
   [windowDelegate release];
 
   [windowHandle close];
   [windowHandle autorelease];
 }
 
 WebWidget* TestShell::CreatePopupWidget(WebView* webview) {
   DCHECK(!m_popupHost);
-  m_popupHost = WebWidgetHost::Create(webViewWnd(), delegate_.get());
+  m_popupHost = WebWidgetHost::Create(webViewWnd(), popup_delegate_.get());
 
   return m_popupHost->webwidget();
 }
 
 void TestShell::ClosePopup() {
   // PostMessage(popupWnd(), WM_CLOSE, 0, 0);
   m_popupHost = NULL;
 }
 
 void TestShell::SizeTo(int width, int height) {
@@ skipping 236 matching lines @@
   return false;
 }
 
 void DidLoadPlugin(const std::string& filename) {
 }
 
 void DidUnloadPlugin(const std::string& filename) {
 }
 
 }  // namespace webkit_glue