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

webkit/tools/test_shell/test_shell.h

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 75 matching lines @@
     static bool layout_test_mode() { return layout_test_mode_; }
 
     // Called from the destructor to let each platform do any necessary
     // cleanup.
     void PlatformCleanUp();
 
     WebView* webView() {
       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.
     void TestFinished();
 
     // 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);
 
     LayoutTestController* layout_test_controller() {
       return layout_test_controller_.get();
     }
     TestWebViewDelegate* delegate() { return delegate_.get(); }
+    TestWebViewDelegate* popup_delegate() { return popup_delegate_.get(); }
     TestNavigationController* navigation_controller() {
       return navigation_controller_.get();
     }
 
     // Resets the LayoutTestController and EventSendingController.  Should be
     // called before loading a page, since some end-editing event notifications
     // may arrive after the previous page has finished dumping its text and
     // therefore end up in the next test's results if the messages are still
     // enabled.
     void ResetTestController();
@@ skipping 44 matching lines @@
 
     static void DestroyWindow(gfx::NativeWindow windowHandle);
 
     // Remove the given window from window_list_, return true if it was in the
     // list and was removed and false otherwise.
     static bool RemoveWindowFromList(gfx::NativeWindow window);
 
     // 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)
     static ATOM RegisterWindowClass();
 #endif
 
     // Called by the WebView delegate WindowObjectCleared() method, this
     // binds the layout_test_controller_ and other C++ controller classes to
     // window JavaScript objects so they can be accessed by layout tests.
     virtual void BindJSObjectsToWindow(WebFrame* frame);
@@ skipping 126 matching lines @@
 
     scoped_ptr<LayoutTestController> layout_test_controller_;
 
     scoped_ptr<EventSendingController> event_sending_controller_;
 
     scoped_ptr<TextInputController> text_input_controller_;
 
     scoped_ptr<TestNavigationController> navigation_controller_;
 
     scoped_refptr<TestWebViewDelegate> delegate_;
+    scoped_refptr<TestWebViewDelegate> popup_delegate_;
 
     const TestParams* test_params_;
 
     // True while a test is preparing to run
     bool test_is_preparing_;
 
     // True while a test is running
     bool test_is_pending_;
 
     // True if driven from a nested message loop.
     bool is_modal_;
 
     // The preferences for the test shell.
     static WebPreferences* web_prefs_;
 
 #if defined(OS_WIN)
     // Used by the watchdog to know when it's finished.
     HANDLE finished_event_;
 #endif
 
     // Dump the stats table counters on exit.
     bool dump_stats_table_on_exit_;
 };
 
 #endif // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H_