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

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

Issue 6277013: Remove command_execution_timeout_ms and fix all the callers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/pyautolib/pyautolib.h ('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) 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 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 // Return the time when the browser was run. 237 // Return the time when the browser was run.
238 base::TimeTicks browser_launch_time() const { 238 base::TimeTicks browser_launch_time() const {
239 return launcher_->browser_launch_time(); 239 return launcher_->browser_launch_time();
240 } 240 }
241 241
242 // Return how long the shutdown took. 242 // Return how long the shutdown took.
243 base::TimeDelta browser_quit_time() const { 243 base::TimeDelta browser_quit_time() const {
244 return launcher_->browser_quit_time(); 244 return launcher_->browser_quit_time();
245 } 245 }
246 246
247 // Compatibility timeout accessors.
248 // TODO(phajdan.jr): update callers and remove these.
249 static int command_execution_timeout_ms() {
250 return TestTimeouts::command_execution_timeout_ms();
251 }
252
253 // Fetch the state which determines whether the profile will be cleared on 247 // Fetch the state which determines whether the profile will be cleared on
254 // next startup. 248 // next startup.
255 bool get_clear_profile() const { 249 bool get_clear_profile() const {
256 return clear_profile_; 250 return clear_profile_;
257 } 251 }
258 // Sets clear_profile_. Should be called before launching browser to have 252 // Sets clear_profile_. Should be called before launching browser to have
259 // any effect. 253 // any effect.
260 void set_clear_profile(bool clear_profile) { 254 void set_clear_profile(bool clear_profile) {
261 clear_profile_ = clear_profile; 255 clear_profile_ = clear_profile;
262 } 256 }
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 #ifdef UNIT_TEST 499 #ifdef UNIT_TEST
506 std::ostream& operator<<(std::ostream& out, const std::wstring& wstr); 500 std::ostream& operator<<(std::ostream& out, const std::wstring& wstr);
507 501
508 template<typename T> 502 template<typename T>
509 std::ostream& operator<<(std::ostream& out, const ::scoped_ptr<T>& ptr) { 503 std::ostream& operator<<(std::ostream& out, const ::scoped_ptr<T>& ptr) {
510 return out << ptr.get(); 504 return out << ptr.get();
511 } 505 }
512 #endif // UNIT_TEST 506 #endif // UNIT_TEST
513 507
514 #endif // CHROME_TEST_UI_UI_TEST_H_ 508 #endif // CHROME_TEST_UI_UI_TEST_H_
OLDNEW
« no previous file with comments | « chrome/test/pyautolib/pyautolib.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698