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

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

Issue 6354005: Remove action_max_timeout_ms and fix all the callers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 9 years, 11 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 | « chrome/test/ui/ui_layout_test.cc ('k') | chrome/worker/worker_uitest.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) 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 #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 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 // Return how long the shutdown took. 239 // Return how long the shutdown took.
240 base::TimeDelta browser_quit_time() const { 240 base::TimeDelta browser_quit_time() const {
241 return launcher_->browser_quit_time(); 241 return launcher_->browser_quit_time();
242 } 242 }
243 243
244 // Compatibility timeout accessors. 244 // Compatibility timeout accessors.
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_max_timeout_ms() {
250 return TestTimeouts::action_max_timeout_ms();
251 }
252 249
253 // Fetch the state which determines whether the profile will be cleared on 250 // Fetch the state which determines whether the profile will be cleared on
254 // next startup. 251 // next startup.
255 bool get_clear_profile() const { 252 bool get_clear_profile() const {
256 return clear_profile_; 253 return clear_profile_;
257 } 254 }
258 // Sets clear_profile_. Should be called before launching browser to have 255 // Sets clear_profile_. Should be called before launching browser to have
259 // any effect. 256 // any effect.
260 void set_clear_profile(bool clear_profile) { 257 void set_clear_profile(bool clear_profile) {
261 clear_profile_ = clear_profile; 258 clear_profile_ = clear_profile;
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 #ifdef UNIT_TEST 502 #ifdef UNIT_TEST
506 std::ostream& operator<<(std::ostream& out, const std::wstring& wstr); 503 std::ostream& operator<<(std::ostream& out, const std::wstring& wstr);
507 504
508 template<typename T> 505 template<typename T>
509 std::ostream& operator<<(std::ostream& out, const ::scoped_ptr<T>& ptr) { 506 std::ostream& operator<<(std::ostream& out, const ::scoped_ptr<T>& ptr) {
510 return out << ptr.get(); 507 return out << ptr.get();
511 } 508 }
512 #endif // UNIT_TEST 509 #endif // UNIT_TEST
513 510
514 #endif // CHROME_TEST_UI_UI_TEST_H_ 511 #endif // CHROME_TEST_UI_UI_TEST_H_
OLDNEW
« no previous file with comments | « chrome/test/ui/ui_layout_test.cc ('k') | chrome/worker/worker_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698