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

Unified Diff: chrome/test/automation/automation_proxy.h

Issue 6685099: Removing command_execution_timeout_ms in favor of action_max_timeout_ms. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/test/automation/automation_proxy.h
===================================================================
--- chrome/test/automation/automation_proxy.h (revision 79305)
+++ chrome/test/automation/automation_proxy.h (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -49,6 +49,7 @@
// and the proxy provider might be still working on the previous
// request.
virtual bool Send(IPC::Message* message) = 0;
+ virtual bool Send(IPC::Message* message, int timeout) = 0;
};
// This is the interface that external processes can use to interact with
@@ -217,6 +218,10 @@
bool SendJSONRequest(const std::string& request,
std::string* response) WARN_UNUSED_RESULT;
+ bool SendJSONRequest(const std::string& request,
+ std::string* response,
+ int timeout) WARN_UNUSED_RESULT;
Paweł Hajdan Jr. 2011/03/26 10:55:12 nit: Similarly here, please remove the version tha
Huyen 2011/03/29 00:11:39 Done.
+
#if defined(OS_CHROMEOS)
// Logs in through the Chrome OS login wizard with given |username|
// and |password|. Returns true on success.
@@ -230,6 +235,7 @@
// AutomationMessageSender implementation.
virtual bool Send(IPC::Message* message) WARN_UNUSED_RESULT;
+ virtual bool Send(IPC::Message* message, int timeout_ms) WARN_UNUSED_RESULT;
Paweł Hajdan Jr. 2011/03/26 10:55:12 Just in case you ask, IMHO it's fine and even pref
// Wrapper over AutomationHandleTracker::InvalidateHandle. Receives the
// message from AutomationProxy, unpacks the messages and routes that call to
@@ -244,17 +250,6 @@
gfx::NativeWindow* external_tab_container,
gfx::NativeWindow* tab);
- int command_execution_timeout_ms() const {
- return static_cast<int>(command_execution_timeout_.InMilliseconds());
- }
-
- // Sets the timeout for subsequent automation calls.
- void set_command_execution_timeout_ms(int timeout_ms) {
- DCHECK(timeout_ms <= 10 * 60 * 1000 ) << "10+ min of automation timeout "
- "can make the test hang and be killed by buildbot";
- command_execution_timeout_ = base::TimeDelta::FromMilliseconds(timeout_ms);
- }
-
// Returns the server version of the server connected. You may only call this
// method after WaitForAppLaunch() has returned SUCCESS or VERSION_MISMATCH.
// If you call it before this, the return value is undefined.

Powered by Google App Engine
This is Rietveld 408576698