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

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

Issue 140008: Add a switch to allow longer shutdown timeouts, since quitting under valgrind... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/test/ui/ui_test.cc » ('j') | 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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 7
8 // This file provides a common base for running UI unit tests, which operate 8 // This file provides a common base for running UI unit tests, which operate
9 // the entire browser application in a separate process for holistic 9 // the entire browser application in a separate process for holistic
10 // functional testing. 10 // functional testing.
(...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 static std::wstring log_level_; // Logging level. 496 static std::wstring log_level_; // Logging level.
497 497
498 scoped_ptr<AutomationProxy> server_; 498 scoped_ptr<AutomationProxy> server_;
499 499
500 MessageLoop message_loop_; // Enables PostTask to main thread. 500 MessageLoop message_loop_; // Enables PostTask to main thread.
501 501
502 int command_execution_timeout_ms_; 502 int command_execution_timeout_ms_;
503 int action_timeout_ms_; 503 int action_timeout_ms_;
504 int action_max_timeout_ms_; 504 int action_max_timeout_ms_;
505 int sleep_timeout_ms_; 505 int sleep_timeout_ms_;
506 int terminate_timeout_ms_;
506 507
507 std::wstring ui_test_name_; 508 std::wstring ui_test_name_;
508 }; 509 };
509 510
510 // These exist only to support the gTest assertion macros, and 511 // These exist only to support the gTest assertion macros, and
511 // shouldn't be used in normal program code. 512 // shouldn't be used in normal program code.
512 #ifdef UNIT_TEST 513 #ifdef UNIT_TEST
513 std::ostream& operator<<(std::ostream& out, const std::wstring& wstr); 514 std::ostream& operator<<(std::ostream& out, const std::wstring& wstr);
514 515
515 template<typename T> 516 template<typename T>
516 std::ostream& operator<<(std::ostream& out, const ::scoped_ptr<T>& ptr) { 517 std::ostream& operator<<(std::ostream& out, const ::scoped_ptr<T>& ptr) {
517 return out << ptr.get(); 518 return out << ptr.get();
518 } 519 }
519 #endif // UNIT_TEST 520 #endif // UNIT_TEST
520 521
521 #endif // CHROME_TEST_UI_UI_TEST_H_ 522 #endif // CHROME_TEST_UI_UI_TEST_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/test/ui/ui_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698