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/environment.h" | 5 #include "base/environment.h" |
6 #include "base/file_util.h" | 6 #include "base/file_util.h" |
7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
8 #include "base/stringprintf.h" | 8 #include "base/stringprintf.h" |
9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
10 #include "base/sys_info.h" | 10 #include "base/sys_info.h" |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 clear_profile_ = false; | 107 clear_profile_ = false; |
108 // Clear template_user_data_ so we don't try to copy it over each time | 108 // Clear template_user_data_ so we don't try to copy it over each time |
109 // through. | 109 // through. |
110 set_template_user_data(base::FilePath()); | 110 set_template_user_data(base::FilePath()); |
111 } | 111 } |
112 } | 112 } |
113 | 113 |
114 std::string times; | 114 std::string times; |
115 for (int i = 0; i < numCycles; ++i) | 115 for (int i = 0; i < numCycles; ++i) |
116 base::StringAppendF(×, "%.2f,", timings[i].InMillisecondsF()); | 116 base::StringAppendF(×, "%.2f,", timings[i].InMillisecondsF()); |
117 perf_test::PrintResultList(graph, "", trace, times, "ms", important); | 117 perf_test::PrintResultList( |
| 118 graph, std::string(), trace, times, "ms", important); |
118 } | 119 } |
119 }; | 120 }; |
120 | 121 |
121 TEST_F(ShutdownTest, DISABLED_SimpleWindowClose) { | 122 TEST_F(ShutdownTest, DISABLED_SimpleWindowClose) { |
122 RunShutdownTest("shutdown", "simple-window-close", | 123 RunShutdownTest("shutdown", "simple-window-close", |
123 true, /* important */ SIMPLE, ProxyLauncher::WINDOW_CLOSE); | 124 true, /* important */ SIMPLE, ProxyLauncher::WINDOW_CLOSE); |
124 } | 125 } |
125 | 126 |
126 TEST_F(ShutdownTest, SimpleUserQuit) { | 127 TEST_F(ShutdownTest, SimpleUserQuit) { |
127 RunShutdownTest("shutdown", "simple-user-quit", | 128 RunShutdownTest("shutdown", "simple-user-quit", |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
160 #define MAYBE_TwentyTabsSessionEnding TwentyTabsSessionEnding | 161 #define MAYBE_TwentyTabsSessionEnding TwentyTabsSessionEnding |
161 #endif | 162 #endif |
162 | 163 |
163 TEST_F(ShutdownTest, MAYBE_TwentyTabsSessionEnding) { | 164 TEST_F(ShutdownTest, MAYBE_TwentyTabsSessionEnding) { |
164 RunShutdownTest("shutdown", "twentytabs-session-ending", | 165 RunShutdownTest("shutdown", "twentytabs-session-ending", |
165 true, /* important */ TWENTY_TABS, | 166 true, /* important */ TWENTY_TABS, |
166 ProxyLauncher::SESSION_ENDING); | 167 ProxyLauncher::SESSION_ENDING); |
167 } | 168 } |
168 | 169 |
169 } // namespace | 170 } // namespace |
OLD | NEW |