summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorhnguyen@chromium.org <hnguyen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-11 22:14:29 +0000
committerhnguyen@chromium.org <hnguyen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-11 22:14:29 +0000
commit536a17e499a44faabf0039de8a550843f7e4e03e (patch)
tree5e0560612eb0975e79a184547f262c626abda5dc /chrome_frame
parentd061105e0b95444d1016b9a1b42cb87c6be599cf (diff)
downloadchromium_src-536a17e499a44faabf0039de8a550843f7e4e03e.zip
chromium_src-536a17e499a44faabf0039de8a550843f7e4e03e.tar.gz
chromium_src-536a17e499a44faabf0039de8a550843f7e4e03e.tar.bz2
Removing command_execution_timeout_ms in favor of action_max_timeout_ms.
R=jcivelli@chromium.org,sky@chromium.org,phajdan.jr@chromium.org,nirnimesh@chromium.org Review URL: http://codereview.chromium.org/6685099 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81164 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/automation_client_mock.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome_frame/test/automation_client_mock.h b/chrome_frame/test/automation_client_mock.h
index 6f736a0..d6e8112 100644
--- a/chrome_frame/test/automation_client_mock.h
+++ b/chrome_frame/test/automation_client_mock.h
@@ -105,6 +105,10 @@ struct MockAutomationMessageSender : public AutomationMessageSender {
return proxy_->Send(msg);
}
+ virtual bool Send(IPC::Message* msg, int timeout_ms) {
+ return proxy_->Send(msg);
+ }
+
void ForwardTo(StrictMock<MockAutomationProxy> *p) {
proxy_ = p;
}