From e34ddc09061b665cc0cccc7aa29302ce43661bcf Mon Sep 17 00:00:00 2001 From: "mirandac@chromium.org" Date: Tue, 11 Aug 2009 16:42:39 +0000 Subject: Make new complex theme startup tests work. Change the name of the NewTabUIStartupTest to ComplexThemeCold so it's picked up by the bot that runs --gtest_filter=NewTabUIStartupTest.*Cold. Also, uncomment startup_test so that it gets tested, now that the theme is installed. BUG= http://crbug.com/18767 TEST= none Review URL: http://codereview.chromium.org/164268 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23031 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/test/startup/feature_startup_test.cc | 2 +- chrome/test/startup/startup_test.cc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'chrome/test/startup') diff --git a/chrome/test/startup/feature_startup_test.cc b/chrome/test/startup/feature_startup_test.cc index 63bf851..3e4dddc 100644 --- a/chrome/test/startup/feature_startup_test.cc +++ b/chrome/test/startup/feature_startup_test.cc @@ -106,7 +106,7 @@ TEST_F(NewTabUIStartupTest, DISABLED_PerfWarm) { UITest::DEFAULT_THEME); } -TEST_F(NewTabUIStartupTest, ComplexTheme) { +TEST_F(NewTabUIStartupTest, ComplexThemeCold) { RunStartupTest("tab_complex_theme_cold", false /* cold */, false /* not important */, UITest::COMPLEX_THEME); diff --git a/chrome/test/startup/startup_test.cc b/chrome/test/startup/startup_test.cc index 7a187de..6c21f82 100644 --- a/chrome/test/startup/startup_test.cc +++ b/chrome/test/startup/startup_test.cc @@ -161,9 +161,9 @@ TEST_F(StartupFileTest, PerfColdGears) { } #endif -//TEST_F(StartupTest, PerfColdComplexTheme) { -// RunStartupTest("warm", "t-theme", false /* warm */, -// false /* not important */, UITest::COMPLEX_THEME); -//} +TEST_F(StartupTest, PerfColdComplexTheme) { + RunStartupTest("warm", "t-theme", false /* warm */, + false /* not important */, UITest::COMPLEX_THEME); +} } // namespace -- cgit v1.1