Chromium Code Reviews| Index: chrome/test/chromedriver/capabilities.cc |
| diff --git a/chrome/test/chromedriver/capabilities.cc b/chrome/test/chromedriver/capabilities.cc |
| index 820cf7d4d4a0ffc9562e84d7414ae43381216c03..14c1e2898dd5953decea7cdf15e79a013231359f 100644 |
| --- a/chrome/test/chromedriver/capabilities.cc |
| +++ b/chrome/test/chromedriver/capabilities.cc |
| @@ -587,6 +587,7 @@ Capabilities::Capabilities() |
| : android_use_running_app(false), |
| detach(false), |
| force_devtools_screenshot(false), |
| + page_loading("normal"), |
|
samuong
2016/07/25 22:44:33
normal, eager and none should be defined constants
evajiang
2016/07/28 17:15:03
Done.
|
| network_emulation_enabled(false) {} |
| Capabilities::~Capabilities() {} |
| @@ -604,6 +605,7 @@ Status Capabilities::Parse(const base::DictionaryValue& desired_caps) { |
| parser_map["chromeOptions"] = base::Bind(&ParseChromeOptions); |
| parser_map["loggingPrefs"] = base::Bind(&ParseLoggingPrefs); |
| parser_map["proxy"] = base::Bind(&ParseProxy); |
| + parser_map["pageLoadingStrategy"] = base::Bind(&ParseString, &page_loading); |
|
samuong
2016/07/25 22:44:33
this should be called "pageLoadStrategy" (see http
evajiang
2016/07/28 17:15:03
Done.
|
| // Network emulation requires device mode, which is only enabled when |
| // mobile emulation is on. |
| if (desired_caps.GetDictionary("chromeOptions.mobileEmulation", nullptr)) { |