Commit d9d9cf8c authored by John Chen's avatar John Chen Committed by Commit Bot

[ChromeDriver] Allow 0 for extensionLoadTimeout

The Chrome option extensionLoadTimeout should allow value of 0,
which means do not wait for extensions to load.

Bug: chromedriver:2329
Change-Id: I38de01f7c1facbbbd181cbd19ac6c710e379afb9
Reviewed-on: https://chromium-review.googlesource.com/963591Reviewed-by: default avatarJonathon Kereliuk <kereliuk@chromium.org>
Commit-Queue: John Chen <johnchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543490}
parent 72a9ef69
...@@ -66,10 +66,11 @@ Status ParseInterval(int* to_set, ...@@ -66,10 +66,11 @@ Status ParseInterval(int* to_set,
Status ParseTimeDelta(base::TimeDelta* to_set, Status ParseTimeDelta(base::TimeDelta* to_set,
const base::Value& option, const base::Value& option,
Capabilities* capabilities) { Capabilities* capabilities) {
int milliseconds; int milliseconds = 0;
Status status = ParseInterval(&milliseconds, option, capabilities); if (!option.GetAsInteger(&milliseconds))
if (status.IsError()) return Status(kUnknownError, "must be an integer");
return status; if (milliseconds < 0)
return Status(kUnknownError, "must be positive or zero");
*to_set = base::TimeDelta::FromMilliseconds(milliseconds); *to_set = base::TimeDelta::FromMilliseconds(milliseconds);
return Status(kOk); return Status(kOk);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment