OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include "chrome/test/webdriver/webdriver_automation.h" | 5 #include "chrome/test/webdriver/webdriver_automation.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <windows.h> | 8 #include <windows.h> |
9 #endif | 9 #endif |
10 | 10 |
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
195 build_no_(0) {} | 195 build_no_(0) {} |
196 | 196 |
197 Automation::~Automation() {} | 197 Automation::~Automation() {} |
198 | 198 |
199 void Automation::Init( | 199 void Automation::Init( |
200 const BrowserOptions& options, | 200 const BrowserOptions& options, |
201 int* build_no, | 201 int* build_no, |
202 Error** error) { | 202 Error** error) { |
203 // Prepare Chrome's command line. | 203 // Prepare Chrome's command line. |
204 CommandLine command(CommandLine::NO_PROGRAM); | 204 CommandLine command(CommandLine::NO_PROGRAM); |
| 205 if (CommandLine::ForCurrentProcess()->HasSwitch("no-sandbox")) { |
| 206 command.AppendSwitch(switches::kNoSandbox); |
| 207 } |
205 command.AppendSwitch(switches::kDisableHangMonitor); | 208 command.AppendSwitch(switches::kDisableHangMonitor); |
206 command.AppendSwitch(switches::kDisablePromptOnRepost); | 209 command.AppendSwitch(switches::kDisablePromptOnRepost); |
207 command.AppendSwitch(switches::kDomAutomationController); | 210 command.AppendSwitch(switches::kDomAutomationController); |
208 command.AppendSwitch(switches::kFullMemoryCrashReport); | 211 command.AppendSwitch(switches::kFullMemoryCrashReport); |
209 command.AppendSwitch(switches::kNoDefaultBrowserCheck); | 212 command.AppendSwitch(switches::kNoDefaultBrowserCheck); |
210 command.AppendSwitch(switches::kNoFirstRun); | 213 command.AppendSwitch(switches::kNoFirstRun); |
211 if (options.detach_process) | 214 if (options.detach_process) |
212 command.AppendSwitch(switches::kAutomationReinitializeOnChannelError); | 215 command.AppendSwitch(switches::kAutomationReinitializeOnChannelError); |
213 if (options.ignore_certificate_errors) | 216 if (options.ignore_certificate_errors) |
214 command.AppendSwitch(switches::kIgnoreCertificateErrors); | 217 command.AppendSwitch(switches::kIgnoreCertificateErrors); |
(...skipping 750 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
965 return CheckVersion(750, message); | 968 return CheckVersion(750, message); |
966 } | 969 } |
967 | 970 |
968 Error* Automation::CheckNewExtensionInterfaceSupported() { | 971 Error* Automation::CheckNewExtensionInterfaceSupported() { |
969 const char* message = | 972 const char* message = |
970 "Extension interface is not supported for this version of Chrome"; | 973 "Extension interface is not supported for this version of Chrome"; |
971 return CheckVersion(947, message); | 974 return CheckVersion(947, message); |
972 } | 975 } |
973 | 976 |
974 } // namespace webdriver | 977 } // namespace webdriver |
OLD | NEW |