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

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

Issue 27240: Make startup_tests build and run on Linux (except reference tests). (Closed)
Patch Set: small bugfix in process_util Created 11 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 unified diff | Download patch
« no previous file with comments | « chrome/test/automation/automation.scons ('k') | chrome/test/automation/automation_proxy.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) 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 "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/process_util.h"
11 #include "base/scoped_ptr.h" 12 #include "base/scoped_ptr.h"
12 #include "base/time.h" 13 #include "base/time.h"
13 #include "base/thread.h" 14 #include "base/thread.h"
14 #include "base/waitable_event.h" 15 #include "base/waitable_event.h"
15 #include "chrome/common/ipc_channel_proxy.h" 16 #include "chrome/common/ipc_channel_proxy.h"
16 #include "chrome/common/ipc_message.h" 17 #include "chrome/common/ipc_message.h"
17 #include "chrome/common/ipc_sync_channel.h" 18 #include "chrome/common/ipc_sync_channel.h"
18 #include "chrome/test/automation/automation_handle_tracker.h" 19 #include "chrome/test/automation/automation_handle_tracker.h"
19 #include "chrome/test/automation/automation_messages.h" 20 #include "chrome/test/automation/automation_messages.h"
20 21
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 153
153 // Set whether or not running the save page as... command show prompt the 154 // Set whether or not running the save page as... command show prompt the
154 // user for a download path. Returns true if the message is successfully 155 // user for a download path. Returns true if the message is successfully
155 // sent. 156 // sent.
156 bool SavePackageShouldPromptUser(bool should_prompt); 157 bool SavePackageShouldPromptUser(bool should_prompt);
157 158
158 // Returns the ID of the automation IPC channel, so that it can be 159 // Returns the ID of the automation IPC channel, so that it can be
159 // passed to the app as a launch parameter. 160 // passed to the app as a launch parameter.
160 const std::wstring& channel_id() const { return channel_id_; } 161 const std::wstring& channel_id() const { return channel_id_; }
161 162
163 #if defined(OS_POSIX)
164 base::file_handle_mapping_vector fds_to_map() const;
165 #endif
166
162 // AutomationMessageSender implementations. 167 // AutomationMessageSender implementations.
163 virtual bool Send(IPC::Message* message); 168 virtual bool Send(IPC::Message* message);
164 virtual bool SendWithTimeout(IPC::Message* message, int timeout, 169 virtual bool SendWithTimeout(IPC::Message* message, int timeout,
165 bool* is_timeout); 170 bool* is_timeout);
166 171
167 // Returns the current AutomationRequest object. 172 // Returns the current AutomationRequest object.
168 AutomationRequest* current_request() { return current_request_; } 173 AutomationRequest* current_request() { return current_request_; }
169 // Clears the current AutomationRequest object. 174 // Clears the current AutomationRequest object.
170 void clear_current_request() { current_request_ = NULL; } 175 void clear_current_request() { current_request_ = NULL; }
171 176
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 214
210 AutomationRequest* current_request_; 215 AutomationRequest* current_request_;
211 216
212 // Delay to let the browser execute the command. 217 // Delay to let the browser execute the command.
213 base::TimeDelta command_execution_timeout_; 218 base::TimeDelta command_execution_timeout_;
214 219
215 DISALLOW_COPY_AND_ASSIGN(AutomationProxy); 220 DISALLOW_COPY_AND_ASSIGN(AutomationProxy);
216 }; 221 };
217 222
218 #endif // CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H__ 223 #endif // CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H__
OLDNEW
« no previous file with comments | « chrome/test/automation/automation.scons ('k') | chrome/test/automation/automation_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698