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 "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 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
213 } | 213 } |
214 } | 214 } |
215 if (!test_name_.empty()) | 215 if (!test_name_.empty()) |
216 launch_arguments_.AppendSwitchASCII(switches::kTestName, test_name_); | 216 launch_arguments_.AppendSwitchASCII(switches::kTestName, test_name_); |
217 #if defined(USE_AURA) | 217 #if defined(USE_AURA) |
218 if (!CommandLine::ForCurrentProcess()->HasSwitch( | 218 if (!CommandLine::ForCurrentProcess()->HasSwitch( |
219 switches::kDisableTestCompositor)) { | 219 switches::kDisableTestCompositor)) { |
220 launch_arguments_.AppendSwitch(switches::kTestCompositor); | 220 launch_arguments_.AppendSwitch(switches::kTestCompositor); |
221 } | 221 } |
222 #endif | 222 #endif |
223 launch_arguments_.AppendSwitch(switches::kDisableUberPage); | |
224 } | 223 } |
225 | 224 |
226 void UITestBase::SetUpProfile() { | 225 void UITestBase::SetUpProfile() { |
227 } | 226 } |
228 | 227 |
229 void UITestBase::LaunchBrowser() { | 228 void UITestBase::LaunchBrowser() { |
230 LaunchBrowser(launch_arguments_, clear_profile_); | 229 LaunchBrowser(launch_arguments_, clear_profile_); |
231 } | 230 } |
232 | 231 |
233 void UITestBase::LaunchBrowserAndServer() { | 232 void UITestBase::LaunchBrowserAndServer() { |
(...skipping 611 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
845 base::PlatformThread::Sleep(kDelay); | 844 base::PlatformThread::Sleep(kDelay); |
846 } | 845 } |
847 | 846 |
848 LOG(INFO) << "Elapsed time: " << (base::Time::Now() - start).InSecondsF() | 847 LOG(INFO) << "Elapsed time: " << (base::Time::Now() - start).InSecondsF() |
849 << " seconds" | 848 << " seconds" |
850 << " call failed " << fail_count << " times" | 849 << " call failed " << fail_count << " times" |
851 << " state was incorrect " << incorrect_state_count << " times"; | 850 << " state was incorrect " << incorrect_state_count << " times"; |
852 ADD_FAILURE() << "Timeout reached in " << __FUNCTION__; | 851 ADD_FAILURE() << "Timeout reached in " << __FUNCTION__; |
853 return false; | 852 return false; |
854 } | 853 } |
OLD | NEW |