Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/test/ui/ui_test.h" | 5 #include "chrome/test/ui/ui_test.h" |
| 6 | 6 |
| 7 #if defined(OS_POSIX) | 7 #if defined(OS_POSIX) |
| 8 #include <signal.h> | 8 #include <signal.h> |
| 9 #include <sys/types.h> | 9 #include <sys/types.h> |
| 10 #endif | 10 #endif |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 196 void UITestBase::SetLaunchSwitches() { | 196 void UITestBase::SetLaunchSwitches() { |
| 197 // We need cookies on file:// for things like the page cycler. | 197 // We need cookies on file:// for things like the page cycler. |
| 198 if (enable_file_cookies_) | 198 if (enable_file_cookies_) |
| 199 launch_arguments_.AppendSwitch(switches::kEnableFileCookies); | 199 launch_arguments_.AppendSwitch(switches::kEnableFileCookies); |
| 200 if (dom_automation_enabled_) | 200 if (dom_automation_enabled_) |
| 201 launch_arguments_.AppendSwitch(switches::kDomAutomationController); | 201 launch_arguments_.AppendSwitch(switches::kDomAutomationController); |
| 202 if (!homepage_.empty()) | 202 if (!homepage_.empty()) |
| 203 launch_arguments_.AppendSwitchASCII(switches::kHomePage, homepage_); | 203 launch_arguments_.AppendSwitchASCII(switches::kHomePage, homepage_); |
| 204 if (!test_name_.empty()) | 204 if (!test_name_.empty()) |
| 205 launch_arguments_.AppendSwitchASCII(switches::kTestName, test_name_); | 205 launch_arguments_.AppendSwitchASCII(switches::kTestName, test_name_); |
| 206 launch_arguments_.AppendSwitch(switches::kSkipGpuDataLoading); | |
|
Paweł Hajdan Jr.
2011/10/25 08:46:40
With the change in test_launcher_utils this should
Zhenyao Mo
2011/10/25 15:51:12
I double-checked again, and test_launcher_utils::P
Paweł Hajdan Jr.
2011/10/25 16:04:36
I think it's called by ProxyLauncher: http://codes
| |
| 206 } | 207 } |
| 207 | 208 |
| 208 void UITestBase::SetUpProfile() { | 209 void UITestBase::SetUpProfile() { |
| 209 } | 210 } |
| 210 | 211 |
| 211 void UITestBase::LaunchBrowser() { | 212 void UITestBase::LaunchBrowser() { |
| 212 LaunchBrowser(launch_arguments_, clear_profile_); | 213 LaunchBrowser(launch_arguments_, clear_profile_); |
| 213 } | 214 } |
| 214 | 215 |
| 215 void UITestBase::LaunchBrowserAndServer() { | 216 void UITestBase::LaunchBrowserAndServer() { |
| (...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 794 base::PlatformThread::Sleep(TestTimeouts::action_timeout_ms() / kCycles); | 795 base::PlatformThread::Sleep(TestTimeouts::action_timeout_ms() / kCycles); |
| 795 } | 796 } |
| 796 | 797 |
| 797 LOG(INFO) << "Elapsed time: " << (base::Time::Now() - start).InSecondsF() | 798 LOG(INFO) << "Elapsed time: " << (base::Time::Now() - start).InSecondsF() |
| 798 << " seconds" | 799 << " seconds" |
| 799 << " call failed " << fail_count << " times" | 800 << " call failed " << fail_count << " times" |
| 800 << " state was incorrect " << incorrect_state_count << " times"; | 801 << " state was incorrect " << incorrect_state_count << " times"; |
| 801 ADD_FAILURE() << "Timeout reached in " << __FUNCTION__; | 802 ADD_FAILURE() << "Timeout reached in " << __FUNCTION__; |
| 802 return false; | 803 return false; |
| 803 } | 804 } |
| OLD | NEW |