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

Side by Side Diff: chrome/test/automation/automation_proxy.h

Issue 195106: Implement per-test timeout for UI tests. (Closed)
Patch Set: sync with trunk Created 11 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
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_AUTOMATION_AUTOMATION_PROXY_H__ 5 #ifndef CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H__
6 #define CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H__ 6 #define CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H__
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "app/message_box_flags.h" 10 #include "app/message_box_flags.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 // automation provider does not match and if perform_version_check_ is set 73 // automation provider does not match and if perform_version_check_ is set
74 // to true. Note that perform_version_check_ defaults to false, call 74 // to true. Note that perform_version_check_ defaults to false, call
75 // set_perform_version_check() to set it. 75 // set_perform_version_check() to set it.
76 AutomationLaunchResult WaitForAppLaunch(); 76 AutomationLaunchResult WaitForAppLaunch();
77 77
78 // Waits for any initial page loads to complete. 78 // Waits for any initial page loads to complete.
79 // NOTE: this only fires once for a run of the application. 79 // NOTE: this only fires once for a run of the application.
80 // Returns true if the load is successful 80 // Returns true if the load is successful
81 bool WaitForInitialLoads(); 81 bool WaitForInitialLoads();
82 82
83 bool QuitAfterTimeout(int timeout_ms);
84
83 // Waits for the initial destinations tab to report that it has finished 85 // Waits for the initial destinations tab to report that it has finished
84 // querying. |load_time| is filled in with how long it took, in milliseconds. 86 // querying. |load_time| is filled in with how long it took, in milliseconds.
85 // NOTE: this only fires once for a run of the application. 87 // NOTE: this only fires once for a run of the application.
86 // Returns true if the load is successful. 88 // Returns true if the load is successful.
87 bool WaitForInitialNewTabUILoad(int* load_time); 89 bool WaitForInitialNewTabUILoad(int* load_time);
88 90
89 // Open a new browser window, returning true on success. |show| 91 // Open a new browser window, returning true on success. |show|
90 // identifies whether the window should be shown. 92 // identifies whether the window should be shown.
91 // False likely indicates an IPC error. 93 // False likely indicates an IPC error.
92 bool OpenNewBrowserWindow(bool show); 94 bool OpenNewBrowserWindow(bool show);
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 // a version resource. 260 // a version resource.
259 bool perform_version_check_; 261 bool perform_version_check_;
260 262
261 // Delay to let the browser execute the command. 263 // Delay to let the browser execute the command.
262 base::TimeDelta command_execution_timeout_; 264 base::TimeDelta command_execution_timeout_;
263 265
264 DISALLOW_COPY_AND_ASSIGN(AutomationProxy); 266 DISALLOW_COPY_AND_ASSIGN(AutomationProxy);
265 }; 267 };
266 268
267 #endif // CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H__ 269 #endif // CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H__
OLDNEW
« no previous file with comments | « chrome/test/automation/automation_messages_internal.h ('k') | chrome/test/automation/automation_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698