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

webkit/tools/test_shell/test_shell_win.cc

 // 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 "webkit/tools/test_shell/test_shell.h"
 
 #include <windows.h>
 #include <atlbase.h>
 #include <commdlg.h>
 #include <objbase.h>
@@ skipping 18 matching lines @@
 #include "skia/ext/bitmap_platform_device.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/plugins/plugin_list.h"
 #include "webkit/tools/test_shell/resource.h"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 #include "webkit/tools/test_shell/test_shell_switches.h"
 
+using WebKit::WebWidget;
+
 #define MAX_LOADSTRING 100
 
 #define BUTTON_WIDTH 72
 #define URLBAR_HEIGHT  24
 
 // Global Variables:
 static TCHAR g_windowTitle[MAX_LOADSTRING];     // The title bar text
 static TCHAR g_windowClass[MAX_LOADSTRING];     // The main window class name
 
 // This is only set for layout tests.  It is used to determine the name of a
@@ skipping 401 matching lines @@
   WaitForSingleObject(thread_handle, 1000);
 }
 
 void TestShell::InteractiveSetFocus(WebWidgetHost* host, bool enable) {
   if (!enable && ::GetFocus() == host->view_handle())
     ::SetFocus(NULL);
 }
 
 WebWidget* TestShell::CreatePopupWidget(WebView* webview) {
   DCHECK(!m_popupHost);
-  m_popupHost = WebWidgetHost::Create(NULL, delegate_.get());
+  m_popupHost = WebWidgetHost::Create(NULL, popup_delegate_.get());
   ShowWindow(popupWnd(), SW_SHOW);
 
   return m_popupHost->webwidget();
 }
 
 void TestShell::ClosePopup() {
   PostMessage(popupWnd(), WM_CLOSE, 0, 0);
   m_popupHost = NULL;
 }
 
@@ skipping 288 matching lines @@
 
 bool EnsureFontLoaded(HFONT font) {
   return true;
 }
 
 bool DownloadUrl(const std::string& url, HWND caller_window) {
   return false;
 }
 
 }  // namespace webkit_glue