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

Unified Diff: chrome/test/webdriver/webdriver_capabilities_parser.cc

Issue 8890026: Allow chromedriver to set local state preferences. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ... Created 9 years 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 side-by-side diff with in-line comments
Download patch
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..ef0fd26062611f99611d5fadbcd24aa88d907c51 100644
--- a/chrome/test/webdriver/webdriver_capabilities_parser.cc
+++ b/chrome/test/webdriver/webdriver_capabilities_parser.cc
@@ -33,7 +33,8 @@ Error* CreateBadInputError(const std::string& name,
} // namespace
Capabilities::Capabilities()
- : command(CommandLine::NO_PROGRAM),
+ : cert_revocation_checking(true),
+ command(CommandLine::NO_PROGRAM),
detach(false),
load_async(false),
native_events(false),
@@ -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;
}
@@ -142,6 +147,14 @@ Error* CapabilitiesParser::ParseBinary(const Value* option) {
return NULL;
}
+Error* CapabilitiesParser::ParseCertRevocationChecking(
Huyen 2011/12/09 23:56:55 did you forget to map this function to the parser_
kkania 2011/12/10 00:37:44 Forgot to delete this. I decided I didn't like thi
+ const base::Value* option) {
+ if (!option->GetAsBoolean(&caps_->cert_revocation_checking))
+ return CreateBadInputError("cert revocation checking",
+ Value::TYPE_BOOLEAN, option);
+ return NULL;
+}
+
Error* CapabilitiesParser::ParseChannel(const Value* option) {
if (!option->GetAsString(&caps_->channel))
return CreateBadInputError("channel", Value::TYPE_STRING, option);
@@ -202,6 +215,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);

Powered by Google App Engine
This is Rietveld 408576698