| 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 #ifndef CHROME_TEST_UI_UI_TEST_H_ | 5 #ifndef CHROME_TEST_UI_UI_TEST_H_ |
| 6 #define CHROME_TEST_UI_UI_TEST_H_ | 6 #define CHROME_TEST_UI_UI_TEST_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 // This file provides a common base for running UI unit tests, which operate | 9 // This file provides a common base for running UI unit tests, which operate |
| 10 // the entire browser application in a separate process for holistic | 10 // the entire browser application in a separate process for holistic |
| (...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 245 // TODO(phajdan.jr): update callers and remove these. | 245 // TODO(phajdan.jr): update callers and remove these. |
| 246 static int command_execution_timeout_ms() { | 246 static int command_execution_timeout_ms() { |
| 247 return TestTimeouts::command_execution_timeout_ms(); | 247 return TestTimeouts::command_execution_timeout_ms(); |
| 248 } | 248 } |
| 249 static int action_timeout_ms() { | 249 static int action_timeout_ms() { |
| 250 return TestTimeouts::action_timeout_ms(); | 250 return TestTimeouts::action_timeout_ms(); |
| 251 } | 251 } |
| 252 static int action_max_timeout_ms() { | 252 static int action_max_timeout_ms() { |
| 253 return TestTimeouts::action_max_timeout_ms(); | 253 return TestTimeouts::action_max_timeout_ms(); |
| 254 } | 254 } |
| 255 static int sleep_timeout_ms() { | |
| 256 // TODO(phajdan.jr): Fix all callers and remove sleep_timeout_ms. | |
| 257 return TestTimeouts::action_timeout_ms(); | |
| 258 } | |
| 259 static int test_timeout_ms() { | 255 static int test_timeout_ms() { |
| 260 return TestTimeouts::huge_test_timeout_ms(); | 256 return TestTimeouts::huge_test_timeout_ms(); |
| 261 } | 257 } |
| 262 | 258 |
| 263 // Fetch the state which determines whether the profile will be cleared on | 259 // Fetch the state which determines whether the profile will be cleared on |
| 264 // next startup. | 260 // next startup. |
| 265 bool get_clear_profile() const { | 261 bool get_clear_profile() const { |
| 266 return clear_profile_; | 262 return clear_profile_; |
| 267 } | 263 } |
| 268 // Sets clear_profile_. Should be called before launching browser to have | 264 // Sets clear_profile_. Should be called before launching browser to have |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 515 #ifdef UNIT_TEST | 511 #ifdef UNIT_TEST |
| 516 std::ostream& operator<<(std::ostream& out, const std::wstring& wstr); | 512 std::ostream& operator<<(std::ostream& out, const std::wstring& wstr); |
| 517 | 513 |
| 518 template<typename T> | 514 template<typename T> |
| 519 std::ostream& operator<<(std::ostream& out, const ::scoped_ptr<T>& ptr) { | 515 std::ostream& operator<<(std::ostream& out, const ::scoped_ptr<T>& ptr) { |
| 520 return out << ptr.get(); | 516 return out << ptr.get(); |
| 521 } | 517 } |
| 522 #endif // UNIT_TEST | 518 #endif // UNIT_TEST |
| 523 | 519 |
| 524 #endif // CHROME_TEST_UI_UI_TEST_H_ | 520 #endif // CHROME_TEST_UI_UI_TEST_H_ |
| OLD | NEW |