| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/path_service.h" | 5 #include "base/path_service.h" |
| 6 #include "base/strings/stringprintf.h" | 6 #include "base/strings/stringprintf.h" |
| 7 #include "base/test/perftimer.h" | 7 #include "base/test/perftimer.h" |
| 8 #include "base/time/time.h" | 8 #include "base/time/time.h" |
| 9 #include "chrome/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
| 10 #include "chrome/common/chrome_paths.h" | 10 #include "chrome/common/chrome_paths.h" |
| 11 #include "chrome/common/chrome_switches.h" | 11 #include "chrome/common/chrome_switches.h" |
| 12 #include "chrome/test/automation/automation_proxy.h" | 12 #include "chrome/test/automation/automation_proxy.h" |
| 13 #include "chrome/test/automation/browser_proxy.h" | 13 #include "chrome/test/automation/browser_proxy.h" |
| 14 #include "chrome/test/automation/window_proxy.h" | 14 #include "chrome/test/automation/window_proxy.h" |
| 15 #include "chrome/test/perf/perf_test.h" | 15 #include "chrome/test/perf/perf_test.h" |
| 16 #include "chrome/test/perf/perf_ui_test_suite.h" | 16 #include "chrome/test/perf/perf_ui_test_suite.h" |
| 17 #include "chrome/test/ui/ui_perf_test.h" | 17 #include "chrome/test/ui/ui_perf_test.h" |
| 18 #include "net/base/net_util.h" | 18 #include "net/base/net_util.h" |
| 19 #include "testing/perf/perf_test.h" |
| 19 #include "ui/gfx/rect.h" | 20 #include "ui/gfx/rect.h" |
| 20 | 21 |
| 21 using base::TimeDelta; | 22 using base::TimeDelta; |
| 22 | 23 |
| 23 namespace { | 24 namespace { |
| 24 | 25 |
| 25 class NewTabUIStartupTest : public UIPerfTest { | 26 class NewTabUIStartupTest : public UIPerfTest { |
| 26 public: | 27 public: |
| 27 NewTabUIStartupTest() { | 28 NewTabUIStartupTest() { |
| 28 show_window_ = true; | 29 show_window_ = true; |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 false /* not important */, | 190 false /* not important */, |
| 190 PerfUITestSuite::COMPLEX_THEME); | 191 PerfUITestSuite::COMPLEX_THEME); |
| 191 } | 192 } |
| 192 | 193 |
| 193 // FLAKY: http://crbug.com/69940 | 194 // FLAKY: http://crbug.com/69940 |
| 194 TEST_F(NewTabUIStartupTest, DISABLED_NewTabTimingTestsCold) { | 195 TEST_F(NewTabUIStartupTest, DISABLED_NewTabTimingTestsCold) { |
| 195 RunNewTabTimingTest(); | 196 RunNewTabTimingTest(); |
| 196 } | 197 } |
| 197 | 198 |
| 198 } // namespace | 199 } // namespace |
| OLD | NEW |