| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/platform_thread.h" | 8 #include "base/platform_thread.h" |
| 9 #include "base/string_number_conversions.h" | 9 #include "base/string_number_conversions.h" |
| 10 #include "base/string_split.h" | 10 #include "base/string_split.h" |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 271 UITest::SetUp(); | 271 UITest::SetUp(); |
| 272 // Set flags to ensure profile is saved and can be restored. | 272 // Set flags to ensure profile is saved and can be restored. |
| 273 #if defined(OS_MACOSX) | 273 #if defined(OS_MACOSX) |
| 274 shutdown_type_ = UITestBase::USER_QUIT; | 274 shutdown_type_ = UITestBase::USER_QUIT; |
| 275 #endif | 275 #endif |
| 276 clear_profile_ = false; | 276 clear_profile_ = false; |
| 277 // Quit and set flags to restore session. | 277 // Quit and set flags to restore session. |
| 278 UITest::TearDown(); | 278 UITest::TearDown(); |
| 279 // Clear all arguments for session restore, or the number of open tabs | 279 // Clear all arguments for session restore, or the number of open tabs |
| 280 // will grow with each restore. | 280 // will grow with each restore. |
| 281 launch_arguments_ = CommandLine(CommandLine::ARGUMENTS_ONLY); | 281 launch_arguments_ = CommandLine(CommandLine::NO_PROGRAM); |
| 282 // The session will be restored once per cycle for numCycles test cycles, | 282 // The session will be restored once per cycle for numCycles test cycles, |
| 283 // and each time, UITest::SetUp will wait for |tab_count| tabs to | 283 // and each time, UITest::SetUp will wait for |tab_count| tabs to |
| 284 // finish loading. | 284 // finish loading. |
| 285 launch_arguments_.AppendSwitchASCII(switches::kRestoreLastSession, | 285 launch_arguments_.AppendSwitchASCII(switches::kRestoreLastSession, |
| 286 base::IntToString(tab_count)); | 286 base::IntToString(tab_count)); |
| 287 } | 287 } |
| 288 RunStartupTest(graph, trace, WARM, NOT_IMPORTANT, UITest::DEFAULT_THEME, | 288 RunStartupTest(graph, trace, WARM, NOT_IMPORTANT, UITest::DEFAULT_THEME, |
| 289 tab_count, nth_timed_tab); | 289 tab_count, nth_timed_tab); |
| 290 } | 290 } |
| 291 | 291 |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 397 UITest::CUSTOM_FRAME, 0, 0); | 397 UITest::CUSTOM_FRAME, 0, 0); |
| 398 } | 398 } |
| 399 | 399 |
| 400 TEST_F(StartupTest, PerfNativeFrameGtkTheme) { | 400 TEST_F(StartupTest, PerfNativeFrameGtkTheme) { |
| 401 RunStartupTest("warm", "custom-frame-gtk-theme", WARM, NOT_IMPORTANT, | 401 RunStartupTest("warm", "custom-frame-gtk-theme", WARM, NOT_IMPORTANT, |
| 402 UITest::CUSTOM_FRAME_NATIVE_THEME, 0, 0); | 402 UITest::CUSTOM_FRAME_NATIVE_THEME, 0, 0); |
| 403 } | 403 } |
| 404 #endif | 404 #endif |
| 405 | 405 |
| 406 } // namespace | 406 } // namespace |
| OLD | NEW |