summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/mac
diff options
context:
space:
mode:
authoravi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-15 18:45:13 +0000
committeravi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-15 18:45:13 +0000
commitd7da72b97e6ffa781b40b3a6f65ddf37eee87c71 (patch)
tree97c8637ca55116fe2140dd75a4dffe13b0889564 /webkit/tools/test_shell/mac
parent3130a853b69a63f159d9d3e74395eb9332f6bfad (diff)
downloadchromium_src-d7da72b97e6ffa781b40b3a6f65ddf37eee87c71.zip
chromium_src-d7da72b97e6ffa781b40b3a6f65ddf37eee87c71.tar.gz
chromium_src-d7da72b97e6ffa781b40b3a6f65ddf37eee87c71.tar.bz2
Changes to test shell on Mac.
Review URL: http://codereview.chromium.org/2809 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/mac')
-rw-r--r--webkit/tools/test_shell/mac/main.mm8
1 files changed, 6 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/mac/main.mm b/webkit/tools/test_shell/mac/main.mm
index 0e7a47d..23ce296 100644
--- a/webkit/tools/test_shell/mac/main.mm
+++ b/webkit/tools/test_shell/mac/main.mm
@@ -8,7 +8,7 @@
#include <string>
-// #include "base/event_recorder.h"
+#include "base/at_exit.h"
#include "base/basictypes.h"
#include "base/command_line.h"
#include "base/file_util.h"
@@ -21,7 +21,7 @@
#include "webkit/tools/test_shell/test_shell.h"
#include "webkit/tools/test_shell/test_shell_switches.h"
-#include "WebSystemInterface.h"
+#include "webkit/tools/test_shell/mac/temp/WebSystemInterface.h"
static char g_currentTestName[PATH_MAX];
@@ -44,6 +44,10 @@ void SetCurrentTestName(char* path) {
int main(const int argc, const char *argv[]) {
InitWebCoreSystemInterface();
+ // Some tests may use base::Singleton<>, thus we need to instantiate
+ // the AtExitManager or else we will leak objects.
+ base::AtExitManager at_exit_manager;
+
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
// Force AppKit to init itself, but don't start the runloop yet