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

webkit/tools/test_shell/test_shell.h

Index: webkit/tools/test_shell/test_shell.h
===================================================================
--- webkit/tools/test_shell/test_shell.h	(revision 20851)
+++ webkit/tools/test_shell/test_shell.h	(working copy)
@@ -93,7 +93,9 @@
       return m_webViewHost.get() ? m_webViewHost->webview() : NULL;
     }
     WebViewHost* webViewHost() { return m_webViewHost.get(); }
-    WebWidget* popup() { return m_popupHost ? m_popupHost->webwidget() : NULL; }
+    WebKit::WebWidget* popup() {
+      return m_popupHost ? m_popupHost->webwidget() : NULL;
+    }
     WebWidgetHost* popupHost() { return m_popupHost; }
 
     // Called by the LayoutTestController to signal test completion.
@@ -102,7 +104,7 @@
     // Called to block the calling thread until TestFinished is called.
     void WaitTestFinished();
 
-    void Show(WebView* webview, WindowOpenDisposition disposition);
+    void Show(WebKit::WebNavigationPolicy policy);
 
     // We use this to avoid relying on Windows focus during layout test mode.
     void SetFocus(WebWidgetHost* host, bool enable);
@@ -111,6 +113,7 @@
       return layout_test_controller_.get();
     }
     TestWebViewDelegate* delegate() { return delegate_.get(); }
+    TestWebViewDelegate* popup_delegate() { return popup_delegate_.get(); }
     TestNavigationController* navigation_controller() {
       return navigation_controller_.get();
     }
@@ -175,7 +178,7 @@
     // Implements CreateWebView for TestWebViewDelegate, which in turn
     // is called as a WebViewDelegate.
     WebView* CreateWebView(WebView* webview);
-    WebWidget* CreatePopupWidget(WebView* webview);
+    WebKit::WebWidget* CreatePopupWidget(WebView* webview);
     void ClosePopup();
 
 #if defined(OS_WIN)
@@ -322,6 +325,7 @@
     scoped_ptr<TestNavigationController> navigation_controller_;
 
     scoped_refptr<TestWebViewDelegate> delegate_;
+    scoped_refptr<TestWebViewDelegate> popup_delegate_;
 
     const TestParams* test_params_;