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 "base/file_util.h" | 7 #include "base/file_util.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/perftimer.h" | 9 #include "base/perftimer.h" |
10 #include "base/time.h" | 10 #include "base/time.h" |
11 #include "chrome/app/chrome_dll_resource.h" | 11 #include "chrome/app/chrome_dll_resource.h" |
12 #include "chrome/common/chrome_paths.h" | 12 #include "chrome/common/chrome_paths.h" |
13 #include "chrome/common/win_util.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; |
| 19 |
18 namespace { | 20 namespace { |
19 | 21 |
20 // 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 |
21 // testing. | 23 // testing. |
22 std::wstring ComputeTypicalUserDataSource() { | 24 std::wstring ComputeTypicalUserDataSource() { |
23 std::wstring source_history_file; | 25 std::wstring source_history_file; |
24 EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, | 26 EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, |
25 &source_history_file)); | 27 &source_history_file)); |
26 file_util::AppendToPath(&source_history_file, L"profiles"); | 28 file_util::AppendToPath(&source_history_file, L"profiles"); |
27 file_util::AppendToPath(&source_history_file, L"typical_history"); | 29 file_util::AppendToPath(&source_history_file, L"typical_history"); |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
100 | 102 |
101 // TODO(pamg): run these tests with a reference build? | 103 // TODO(pamg): run these tests with a reference build? |
102 | 104 |
103 TEST_F(NewTabUIStartupTest, PerfCold) { | 105 TEST_F(NewTabUIStartupTest, PerfCold) { |
104 RunStartupTest(L"tab_cold", false /* not cold */, true /* important */); | 106 RunStartupTest(L"tab_cold", false /* not cold */, true /* important */); |
105 } | 107 } |
106 | 108 |
107 TEST_F(NewTabUIStartupTest, DISABLED_PerfWarm) { | 109 TEST_F(NewTabUIStartupTest, DISABLED_PerfWarm) { |
108 RunStartupTest(L"tab_warm", true /* cold */, false /* not important */); | 110 RunStartupTest(L"tab_warm", true /* cold */, false /* not important */); |
109 } | 111 } |
OLD | NEW |