Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(293)

Side by Side Diff: chrome/test/ui/ui_test.h

Issue 3391026: Remove sleep_timeout from TestTimeouts. (Closed)
Patch Set: Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/test/test_timeouts.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 static int command_execution_timeout_ms() { 367 static int command_execution_timeout_ms() {
368 return TestTimeouts::command_execution_timeout_ms(); 368 return TestTimeouts::command_execution_timeout_ms();
369 } 369 }
370 static int action_timeout_ms() { 370 static int action_timeout_ms() {
371 return TestTimeouts::action_timeout_ms(); 371 return TestTimeouts::action_timeout_ms();
372 } 372 }
373 static int action_max_timeout_ms() { 373 static int action_max_timeout_ms() {
374 return TestTimeouts::action_max_timeout_ms(); 374 return TestTimeouts::action_max_timeout_ms();
375 } 375 }
376 static int sleep_timeout_ms() { 376 static int sleep_timeout_ms() {
377 return TestTimeouts::sleep_timeout_ms(); 377 // TODO(phajdan.jr): Fix all callers and remove sleep_timeout_ms.
378 return TestTimeouts::action_timeout_ms();
Evan Martin 2010/09/27 16:15:01 Do we ever use flags to adjust sleep_timeout_ms !=
378 } 379 }
379 static int test_timeout_ms() { 380 static int test_timeout_ms() {
380 return TestTimeouts::huge_test_timeout_ms(); 381 return TestTimeouts::huge_test_timeout_ms();
381 } 382 }
382 383
383 void set_ui_test_name(const std::string& name) { 384 void set_ui_test_name(const std::string& name) {
384 ui_test_name_ = name; 385 ui_test_name_ = name;
385 } 386 }
386 387
387 // Fetch the state which determines whether the profile will be cleared on 388 // Fetch the state which determines whether the profile will be cleared on
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
576 #ifdef UNIT_TEST 577 #ifdef UNIT_TEST
577 std::ostream& operator<<(std::ostream& out, const std::wstring& wstr); 578 std::ostream& operator<<(std::ostream& out, const std::wstring& wstr);
578 579
579 template<typename T> 580 template<typename T>
580 std::ostream& operator<<(std::ostream& out, const ::scoped_ptr<T>& ptr) { 581 std::ostream& operator<<(std::ostream& out, const ::scoped_ptr<T>& ptr) {
581 return out << ptr.get(); 582 return out << ptr.get();
582 } 583 }
583 #endif // UNIT_TEST 584 #endif // UNIT_TEST
584 585
585 #endif // CHROME_TEST_UI_UI_TEST_H_ 586 #endif // CHROME_TEST_UI_UI_TEST_H_
OLDNEW
« no previous file with comments | « chrome/test/test_timeouts.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698