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

webkit/tools/test_shell/test_shell_gtk.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 <errno.h>
 #include <fcntl.h>
 #include <fontconfig/fontconfig.h>
 #include <gtk/gtk.h>
@@ skipping 14 matching lines @@
 #include "net/base/net_util.h"
 #include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/glue/resource_loader_bridge.h"
 #include "webkit/glue/webframe.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/webview.h"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
+using WebKit::WebWidget;
+
 namespace {
 
 // Convert a FilePath into an FcChar* (used by fontconfig).
 // The pointer only lives for the duration for the expression.
 const FcChar8* FilePathAsFcChar(const FilePath& path) {
   return reinterpret_cast<const FcChar8*>(path.value().c_str());
 }
 
 // Data resources on linux.  This is a pointer to the mmapped resources file.
 static base::DataPack* g_resource_data_pack = NULL;
@@ skipping 415 matching lines @@
 }
 
 void TestShell::DestroyWindow(gfx::NativeWindow windowHandle) {
   RemoveWindowFromList(windowHandle);
   gtk_widget_destroy(GTK_WIDGET(windowHandle));
 }
 
 WebWidget* TestShell::CreatePopupWidget(WebView* webview) {
   GtkWidget* popupwindow = gtk_window_new(GTK_WINDOW_POPUP);
   GtkWidget* vbox = gtk_vbox_new(FALSE, 0);
-  WebWidgetHost* host = WebWidgetHost::Create(vbox, delegate_);
+  WebWidgetHost* host = WebWidgetHost::Create(vbox, popup_delegate_);
   gtk_container_add(GTK_CONTAINER(popupwindow), vbox);
   m_popupHost = host;
 
   // Grab all input to the test shell and funnel it to the popup.
   // The popup will detect if mouseclicks are outside its bounds and destroy
   // itself if so. Clicks that are outside the test_shell window will destroy
   // the popup by taking focus away from the main window.
   gtk_grab_add(host->view_handle());
 
   return host->webwidget();
@@ skipping 202 matching lines @@
       break;
   }
   return TestShell::NetResourceProvider(resource_id);
 }
 
 bool GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) {
   return NPAPI::PluginList::Singleton()->GetPlugins(refresh, plugins);
 }
 
 }  // namespace webkit_glue