diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-11 16:42:39 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-11 16:42:39 +0000 |
| commit | e34ddc09061b665cc0cccc7aa29302ce43661bcf (patch) | |
| tree | 7424d782fe46b436c4111f933aad9ae96b50eedd /chrome/test/startup | |
| parent | 599ea88332cb4d5856dd5c3ad422567fdc2e2229 (diff) | |
| download | chromium_src-e34ddc09061b665cc0cccc7aa29302ce43661bcf.zip chromium_src-e34ddc09061b665cc0cccc7aa29302ce43661bcf.tar.gz chromium_src-e34ddc09061b665cc0cccc7aa29302ce43661bcf.tar.bz2 | |
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
Diffstat (limited to 'chrome/test/startup')
| -rw-r--r-- | chrome/test/startup/feature_startup_test.cc | 2 | ||||
| -rw-r--r-- | chrome/test/startup/startup_test.cc | 8 |
2 files changed, 5 insertions, 5 deletions
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 |