OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/chromedriver/capabilities.h" | 5 #include "chrome/test/chromedriver/capabilities.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
258 base::Bind(&ParseString, &capabilities->android_activity); | 258 base::Bind(&ParseString, &capabilities->android_activity); |
259 parser_map["androidDeviceSerial"] = | 259 parser_map["androidDeviceSerial"] = |
260 base::Bind(&ParseString, &capabilities->android_device_serial); | 260 base::Bind(&ParseString, &capabilities->android_device_serial); |
261 parser_map["androidPackage"] = | 261 parser_map["androidPackage"] = |
262 base::Bind(&ParseString, &capabilities->android_package); | 262 base::Bind(&ParseString, &capabilities->android_package); |
263 parser_map["androidProcess"] = | 263 parser_map["androidProcess"] = |
264 base::Bind(&ParseString, &capabilities->android_process); | 264 base::Bind(&ParseString, &capabilities->android_process); |
265 parser_map["androidUseRunningApp"] = | 265 parser_map["androidUseRunningApp"] = |
266 base::Bind(&ParseBoolean, &capabilities->android_use_running_app); | 266 base::Bind(&ParseBoolean, &capabilities->android_use_running_app); |
267 parser_map["args"] = base::Bind(&ParseSwitches); | 267 parser_map["args"] = base::Bind(&ParseSwitches); |
| 268 parser_map["loadAsync"] = base::Bind(&IgnoreDeprecatedOption, "loadAsync"); |
268 } else if (is_existing) { | 269 } else if (is_existing) { |
269 parser_map["debuggerAddress"] = base::Bind(&ParseUseExistingBrowser); | 270 parser_map["debuggerAddress"] = base::Bind(&ParseUseExistingBrowser); |
270 } else { | 271 } else { |
271 parser_map["args"] = base::Bind(&ParseSwitches); | 272 parser_map["args"] = base::Bind(&ParseSwitches); |
272 parser_map["binary"] = base::Bind(&ParseFilePath, &capabilities->binary); | 273 parser_map["binary"] = base::Bind(&ParseFilePath, &capabilities->binary); |
273 parser_map["detach"] = base::Bind(&ParseBoolean, &capabilities->detach); | 274 parser_map["detach"] = base::Bind(&ParseBoolean, &capabilities->detach); |
274 parser_map["excludeSwitches"] = base::Bind(&ParseExcludeSwitches); | 275 parser_map["excludeSwitches"] = base::Bind(&ParseExcludeSwitches); |
275 parser_map["extensions"] = base::Bind(&ParseExtensions); | 276 parser_map["extensions"] = base::Bind(&ParseExtensions); |
276 parser_map["forceDevToolsScreenshot"] = base::Bind( | 277 parser_map["forceDevToolsScreenshot"] = base::Bind( |
277 &ParseBoolean, &capabilities->force_devtools_screenshot); | 278 &ParseBoolean, &capabilities->force_devtools_screenshot); |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
432 if (desired_caps.Get(it->first, &capability)) { | 433 if (desired_caps.Get(it->first, &capability)) { |
433 Status status = it->second.Run(*capability, this); | 434 Status status = it->second.Run(*capability, this); |
434 if (status.IsError()) { | 435 if (status.IsError()) { |
435 return Status( | 436 return Status( |
436 kUnknownError, "cannot parse capability: " + it->first, status); | 437 kUnknownError, "cannot parse capability: " + it->first, status); |
437 } | 438 } |
438 } | 439 } |
439 } | 440 } |
440 return Status(kOk); | 441 return Status(kOk); |
441 } | 442 } |
OLD | NEW |