| Index: chrome/test/webdriver/webdriver_capabilities_parser.cc
|
| diff --git a/chrome/test/webdriver/webdriver_capabilities_parser.cc b/chrome/test/webdriver/webdriver_capabilities_parser.cc
|
| index fabdd4adee1bfe184e65a0a1424c6fedbe249ac6..aa5a28053694a5abe74084f9b2185b7bb7db94e1 100644
|
| --- a/chrome/test/webdriver/webdriver_capabilities_parser.cc
|
| +++ b/chrome/test/webdriver/webdriver_capabilities_parser.cc
|
| @@ -37,6 +37,7 @@ Capabilities::Capabilities()
|
| detach(false),
|
| load_async(false),
|
| native_events(false),
|
| + no_website_testing_defaults(false),
|
| verbose(false) { }
|
|
|
| Capabilities::~Capabilities() { }
|
| @@ -78,6 +79,8 @@ Error* CapabilitiesParser::Parse() {
|
| parser_map["chrome.nativeEvents"] = &CapabilitiesParser::ParseNativeEvents;
|
| parser_map["chrome.profile"] = &CapabilitiesParser::ParseProfile;
|
| parser_map["chrome.switches"] = &CapabilitiesParser::ParseArgs;
|
| + parser_map["chrome.noWebsiteTestingDefaults"] =
|
| + &CapabilitiesParser::ParseNoWebsiteTestingDefaults;
|
| parser_map["chrome.verbose"] = &CapabilitiesParser::ParseVerbose;
|
| } else {
|
| parser_map["args"] = &CapabilitiesParser::ParseArgs;
|
| @@ -88,6 +91,8 @@ Error* CapabilitiesParser::Parse() {
|
| parser_map["loadAsync"] = &CapabilitiesParser::ParseLoadAsync;
|
| parser_map["nativeEvents"] = &CapabilitiesParser::ParseNativeEvents;
|
| parser_map["profile"] = &CapabilitiesParser::ParseProfile;
|
| + parser_map["noWebsiteTestingDefaults"] =
|
| + &CapabilitiesParser::ParseNoWebsiteTestingDefaults;
|
| parser_map["verbose"] = &CapabilitiesParser::ParseVerbose;
|
| }
|
|
|
| @@ -202,6 +207,13 @@ Error* CapabilitiesParser::ParseProfile(const Value* option) {
|
| return NULL;
|
| }
|
|
|
| +Error* CapabilitiesParser::ParseNoWebsiteTestingDefaults(const Value* option) {
|
| + if (!option->GetAsBoolean(&caps_->no_website_testing_defaults))
|
| + return CreateBadInputError("noWebsiteTestingDefaults",
|
| + Value::TYPE_BOOLEAN, option);
|
| + return NULL;
|
| +}
|
| +
|
| Error* CapabilitiesParser::ParseVerbose(const Value* option) {
|
| if (!option->GetAsBoolean(&caps_->verbose))
|
| return CreateBadInputError("verbose", Value::TYPE_BOOLEAN, option);
|
|
|