| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/path_service.h" | 6 #include "base/path_service.h" |
| 7 #include "base/perftimer.h" | 7 #include "base/perftimer.h" |
| 8 #include "base/stringprintf.h" | 8 #include "base/stringprintf.h" |
| 9 #include "base/time.h" | 9 #include "base/time.h" |
| 10 #include "chrome/app/chrome_command_ids.h" | 10 #include "chrome/app/chrome_command_ids.h" |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 } | 152 } |
| 153 | 153 |
| 154 PrintTimings("script_start", scriptstart_times, false /* important */); | 154 PrintTimings("script_start", scriptstart_times, false /* important */); |
| 155 PrintTimings("domcontent_loaded", domcontentloaded_times, | 155 PrintTimings("domcontent_loaded", domcontentloaded_times, |
| 156 false /* important */); | 156 false /* important */); |
| 157 PrintTimings("onload", onload_times, false /* important */); | 157 PrintTimings("onload", onload_times, false /* important */); |
| 158 } | 158 } |
| 159 }; | 159 }; |
| 160 | 160 |
| 161 // FLAKY: http://crbug.com/69940 | 161 // FLAKY: http://crbug.com/69940 |
| 162 TEST_F(NewTabUIStartupTest, FLAKY_PerfRefCold) { | 162 TEST_F(NewTabUIStartupTest, DISABLED_PerfRefCold) { |
| 163 UseReferenceBuild(); | 163 UseReferenceBuild(); |
| 164 RunStartupTest("tab_cold_ref", false /* cold */, true /* important */, | 164 RunStartupTest("tab_cold_ref", false /* cold */, true /* important */, |
| 165 UITestBase::DEFAULT_THEME); | 165 UITestBase::DEFAULT_THEME); |
| 166 } | 166 } |
| 167 | 167 |
| 168 // FLAKY: http://crbug.com/69940 | 168 // FLAKY: http://crbug.com/69940 |
| 169 TEST_F(NewTabUIStartupTest, FLAKY_PerfCold) { | 169 TEST_F(NewTabUIStartupTest, DISABLED_PerfCold) { |
| 170 RunStartupTest("tab_cold", false /* cold */, true /* important */, | 170 RunStartupTest("tab_cold", false /* cold */, true /* important */, |
| 171 UITestBase::DEFAULT_THEME); | 171 UITestBase::DEFAULT_THEME); |
| 172 } | 172 } |
| 173 | 173 |
| 174 // FLAKY: http://crbug.com/69940 | 174 // FLAKY: http://crbug.com/69940 |
| 175 TEST_F(NewTabUIStartupTest, FLAKY_PerfRefWarm) { | 175 TEST_F(NewTabUIStartupTest, DISABLED_PerfRefWarm) { |
| 176 UseReferenceBuild(); | 176 UseReferenceBuild(); |
| 177 RunStartupTest("tab_warm_ref", true /* warm */, true /* not important */, | 177 RunStartupTest("tab_warm_ref", true /* warm */, true /* not important */, |
| 178 UITestBase::DEFAULT_THEME); | 178 UITestBase::DEFAULT_THEME); |
| 179 } | 179 } |
| 180 | 180 |
| 181 // FLAKY: http://crbug.com/69940 | 181 // FLAKY: http://crbug.com/69940 |
| 182 TEST_F(NewTabUIStartupTest, FLAKY_PerfWarm) { | 182 TEST_F(NewTabUIStartupTest, DISABLED_PerfWarm) { |
| 183 RunStartupTest("tab_warm", true /* warm */, true /* not important */, | 183 RunStartupTest("tab_warm", true /* warm */, true /* not important */, |
| 184 UITestBase::DEFAULT_THEME); | 184 UITestBase::DEFAULT_THEME); |
| 185 } | 185 } |
| 186 | 186 |
| 187 // FLAKY: http://crbug.com/69940 | 187 // FLAKY: http://crbug.com/69940 |
| 188 TEST_F(NewTabUIStartupTest, FLAKY_ComplexThemeCold) { | 188 TEST_F(NewTabUIStartupTest, DISABLED_ComplexThemeCold) { |
| 189 RunStartupTest("tab_complex_theme_cold", false /* cold */, | 189 RunStartupTest("tab_complex_theme_cold", false /* cold */, |
| 190 false /* not important */, | 190 false /* not important */, |
| 191 UITestBase::COMPLEX_THEME); | 191 UITestBase::COMPLEX_THEME); |
| 192 } | 192 } |
| 193 | 193 |
| 194 // FLAKY: http://crbug.com/69940 | 194 // FLAKY: http://crbug.com/69940 |
| 195 TEST_F(NewTabUIStartupTest, FLAKY_NewTabTimingTestsCold) { | 195 TEST_F(NewTabUIStartupTest, DISABLED_NewTabTimingTestsCold) { |
| 196 RunNewTabTimingTest(); | 196 RunNewTabTimingTest(); |
| 197 } | 197 } |
| 198 | 198 |
| 199 #if defined(TOOLKIT_USES_GTK) | 199 #if defined(TOOLKIT_USES_GTK) |
| 200 TEST_F(NewTabUIStartupTest, GtkThemeCold) { | 200 TEST_F(NewTabUIStartupTest, GtkThemeCold) { |
| 201 RunStartupTest("tab_gtk_theme_cold", false /* cold */, | 201 RunStartupTest("tab_gtk_theme_cold", false /* cold */, |
| 202 false /* not important */, | 202 false /* not important */, |
| 203 UITestBase::NATIVE_THEME); | 203 UITestBase::NATIVE_THEME); |
| 204 } | 204 } |
| 205 | 205 |
| 206 TEST_F(NewTabUIStartupTest, NativeFrameCold) { | 206 TEST_F(NewTabUIStartupTest, NativeFrameCold) { |
| 207 RunStartupTest("tab_custom_frame_cold", false /* cold */, | 207 RunStartupTest("tab_custom_frame_cold", false /* cold */, |
| 208 false /* not important */, | 208 false /* not important */, |
| 209 UITestBase::CUSTOM_FRAME); | 209 UITestBase::CUSTOM_FRAME); |
| 210 } | 210 } |
| 211 | 211 |
| 212 TEST_F(NewTabUIStartupTest, NativeFrameGtkThemeCold) { | 212 TEST_F(NewTabUIStartupTest, NativeFrameGtkThemeCold) { |
| 213 RunStartupTest("tab_custom_frame_gtk_theme_cold", false /* cold */, | 213 RunStartupTest("tab_custom_frame_gtk_theme_cold", false /* cold */, |
| 214 false /* not important */, | 214 false /* not important */, |
| 215 UITestBase::CUSTOM_FRAME_NATIVE_THEME); | 215 UITestBase::CUSTOM_FRAME_NATIVE_THEME); |
| 216 } | 216 } |
| 217 #endif | 217 #endif |
| 218 | 218 |
| 219 } // namespace | 219 } // namespace |
| OLD | NEW |