| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/file_util.h" | 5 #include "base/file_util.h" |
| 6 #include "base/gfx/rect.h" | 6 #include "base/gfx/rect.h" |
| 7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
| 8 #include "base/perftimer.h" | 8 #include "base/perftimer.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/time.h" | 10 #include "base/time.h" |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 RunStartupTest("tab_cold_ref", false /* cold */, true /* important */, | 182 RunStartupTest("tab_cold_ref", false /* cold */, true /* important */, |
| 183 UITest::DEFAULT_THEME); | 183 UITest::DEFAULT_THEME); |
| 184 } | 184 } |
| 185 #endif | 185 #endif |
| 186 | 186 |
| 187 TEST_F(NewTabUIStartupTest, PerfCold) { | 187 TEST_F(NewTabUIStartupTest, PerfCold) { |
| 188 RunStartupTest("tab_cold", false /* cold */, true /* important */, | 188 RunStartupTest("tab_cold", false /* cold */, true /* important */, |
| 189 UITest::DEFAULT_THEME); | 189 UITest::DEFAULT_THEME); |
| 190 } | 190 } |
| 191 | 191 |
| 192 #if defined(OS_WIN) | 192 #if !defined(OS_MACOSX) |
| 193 // TODO(tc): Update the Mac reference build to support | 193 // TODO(tc): Update the Mac reference build to support |
| 194 // WaitForInitialNewTabUILoad. | 194 // WaitForInitialNewTabUILoad. |
| 195 // TODO(tc): This is failing on Linux too. | |
| 196 TEST_F(NewTabUIStartupTest, PerfRefWarm) { | 195 TEST_F(NewTabUIStartupTest, PerfRefWarm) { |
| 197 UseReferenceBuild(); | 196 UseReferenceBuild(); |
| 198 RunStartupTest("tab_warm_ref", true /* warm */, true /* not important */, | 197 RunStartupTest("tab_warm_ref", true /* warm */, true /* not important */, |
| 199 UITest::DEFAULT_THEME); | 198 UITest::DEFAULT_THEME); |
| 200 } | 199 } |
| 201 #endif | 200 #endif |
| 202 | 201 |
| 203 TEST_F(NewTabUIStartupTest, PerfWarm) { | 202 TEST_F(NewTabUIStartupTest, PerfWarm) { |
| 204 RunStartupTest("tab_warm", true /* warm */, true /* not important */, | 203 RunStartupTest("tab_warm", true /* warm */, true /* not important */, |
| 205 UITest::DEFAULT_THEME); | 204 UITest::DEFAULT_THEME); |
| (...skipping 23 matching lines...) Expand all Loading... |
| 229 } | 228 } |
| 230 | 229 |
| 231 TEST_F(NewTabUIStartupTest, NativeFrameGtkThemeCold) { | 230 TEST_F(NewTabUIStartupTest, NativeFrameGtkThemeCold) { |
| 232 RunStartupTest("tab_custom_frame_gtk_theme_cold", false /* cold */, | 231 RunStartupTest("tab_custom_frame_gtk_theme_cold", false /* cold */, |
| 233 false /* not important */, | 232 false /* not important */, |
| 234 UITest::CUSTOM_FRAME_NATIVE_THEME); | 233 UITest::CUSTOM_FRAME_NATIVE_THEME); |
| 235 } | 234 } |
| 236 #endif | 235 #endif |
| 237 | 236 |
| 238 } // namespace | 237 } // namespace |
| OLD | NEW |