summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/test_shell_test.cc
diff options
context:
space:
mode:
authoravi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-10 21:21:51 +0000
committeravi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-10 21:21:51 +0000
commitf7013b72494bdc0ab64abe9584decbbb55e9fe1a (patch)
tree0cd9d205a3de0659f7d562ad220a362cf9fc5651 /webkit/tools/test_shell/test_shell_test.cc
parent6838de52128ad10319f26e98e979a866e10d0dd8 (diff)
downloadchromium_src-f7013b72494bdc0ab64abe9584decbbb55e9fe1a.zip
chromium_src-f7013b72494bdc0ab64abe9584decbbb55e9fe1a.tar.gz
chromium_src-f7013b72494bdc0ab64abe9584decbbb55e9fe1a.tar.bz2
Bring test shell test into the mac project
Review URL: http://codereview.chromium.org/1705 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2017 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_shell_test.cc')
-rw-r--r--webkit/tools/test_shell/test_shell_test.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/test_shell_test.cc b/webkit/tools/test_shell/test_shell_test.cc
index e725c99..31aee4e 100644
--- a/webkit/tools/test_shell/test_shell_test.cc
+++ b/webkit/tools/test_shell/test_shell_test.cc
@@ -4,6 +4,7 @@
#include "webkit/tools/test_shell/test_shell_test.h"
+#include "base/basictypes.h"
#include "base/file_util.h"
#include "base/message_loop.h"
#include "base/path_service.h"
@@ -17,7 +18,9 @@ std::wstring TestShellTest::GetTestURL(std::wstring test_case_path,
void TestShellTest::SetUp() {
// Make a test shell for use by the test.
+#if defined(OS_WIN)
TestShell::RegisterWindowClass();
+#endif
CreateEmptyWindow();
test_shell_->Show(test_shell_->webView(), NEW_WINDOW);
@@ -31,7 +34,7 @@ void TestShellTest::SetUp() {
void TestShellTest::TearDown() {
// Loading a blank url clears the memory in the current page.
test_shell_->LoadURL(L"about:blank");
- DestroyWindow(test_shell_->mainWnd());
+ test_shell_->DestroyWindow(test_shell_->mainWnd());
LayoutTestController::ClearShell();
// Flush the MessageLoop of any residual tasks.