summaryrefslogtreecommitdiffstats
path: root/chrome/test/startup
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-18 19:08:32 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-18 19:08:32 +0000
commita4a0bd9562e38ffff8aaf58031bdde0878ebfea4 (patch)
tree71f1db142ccb47e734c540d4dfc1963629a96b25 /chrome/test/startup
parent1849d01a855914348bbdc07c7674764daf549358 (diff)
downloadchromium_src-a4a0bd9562e38ffff8aaf58031bdde0878ebfea4.zip
chromium_src-a4a0bd9562e38ffff8aaf58031bdde0878ebfea4.tar.gz
chromium_src-a4a0bd9562e38ffff8aaf58031bdde0878ebfea4.tar.bz2
Make startup_tests build and work on Mac.
Also ensure that Chromium.app quits properly between the tests. http://crbug.com/8391 Review URL: http://codereview.chromium.org/42306 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11998 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/startup')
-rw-r--r--chrome/test/startup/startup_test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/startup/startup_test.cc b/chrome/test/startup/startup_test.cc
index 72b239b..c63629a 100644
--- a/chrome/test/startup/startup_test.cc
+++ b/chrome/test/startup/startup_test.cc
@@ -107,8 +107,6 @@ class StartupFileTest : public StartupTest {
}
};
-} // namespace
-
TEST_F(StartupTest, Perf) {
RunStartupTest("warm", "t", false /* not cold */, true /* important */);
}
@@ -138,3 +136,5 @@ TEST_F(StartupFileTest, PerfColdGears) {
}
#endif // defined(OS_WIN)
+
+} // namespace