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 <windows.h> | 5 #include <windows.h> |
6 | 6 |
| 7 #include "app/win_util.h" |
7 #include "base/file_util.h" | 8 #include "base/file_util.h" |
8 #include "base/path_service.h" | 9 #include "base/path_service.h" |
9 #include "base/perftimer.h" | 10 #include "base/perftimer.h" |
10 #include "base/time.h" | 11 #include "base/time.h" |
11 #include "chrome/app/chrome_dll_resource.h" | 12 #include "chrome/app/chrome_dll_resource.h" |
12 #include "chrome/common/chrome_paths.h" | 13 #include "chrome/common/chrome_paths.h" |
13 #include "chrome/common/win_util.h" | |
14 #include "chrome/test/automation/browser_proxy.h" | 14 #include "chrome/test/automation/browser_proxy.h" |
15 #include "chrome/test/ui/ui_test.h" | 15 #include "chrome/test/ui/ui_test.h" |
16 #include "net/base/net_util.h" | 16 #include "net/base/net_util.h" |
17 | 17 |
18 using base::TimeDelta; | 18 using base::TimeDelta; |
19 | 19 |
20 namespace { | 20 namespace { |
21 | 21 |
22 // Returns the directory name where the "typical" user data is that we use for | 22 // Returns the directory name where the "typical" user data is that we use for |
23 // testing. | 23 // testing. |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
95 | 95 |
96 // TODO(pamg): run these tests with a reference build? | 96 // TODO(pamg): run these tests with a reference build? |
97 | 97 |
98 TEST_F(NewTabUIStartupTest, PerfCold) { | 98 TEST_F(NewTabUIStartupTest, PerfCold) { |
99 RunStartupTest("tab_cold", false /* not cold */, true /* important */); | 99 RunStartupTest("tab_cold", false /* not cold */, true /* important */); |
100 } | 100 } |
101 | 101 |
102 TEST_F(NewTabUIStartupTest, DISABLED_PerfWarm) { | 102 TEST_F(NewTabUIStartupTest, DISABLED_PerfWarm) { |
103 RunStartupTest("tab_warm", true /* cold */, false /* not important */); | 103 RunStartupTest("tab_warm", true /* cold */, false /* not important */); |
104 } | 104 } |
OLD | NEW |