| Index: chrome/test/chromedriver/session_commands.cc
|
| diff --git a/chrome/test/chromedriver/session_commands.cc b/chrome/test/chromedriver/session_commands.cc
|
| index 654a73858815e5f74c1076079a7c8f6040d232de..a7812b7fc511421e7e561cd04af28dce08728841 100644
|
| --- a/chrome/test/chromedriver/session_commands.cc
|
| +++ b/chrome/test/chromedriver/session_commands.cc
|
| @@ -202,14 +202,16 @@ Status InitSessionHelper(const InitSessionParams& bound_params,
|
| bound_params.port_manager,
|
| capabilities,
|
| &devtools_event_listeners,
|
| - &session->chrome);
|
| + &session->chrome,
|
| + session->w3c_compliant);
|
| if (status.IsError())
|
| return status;
|
|
|
| session->chrome->set_page_load_strategy(capabilities.page_load_strategy);
|
|
|
| std::list<std::string> web_view_ids;
|
| - status = session->chrome->GetWebViewIds(&web_view_ids);
|
| + status = session->chrome->GetWebViewIds(&web_view_ids,
|
| + session->w3c_compliant);
|
| if (status.IsError() || web_view_ids.empty()) {
|
| return status.IsError() ? status :
|
| Status(kUnknownError, "unable to discover open window in chrome");
|
| @@ -282,7 +284,7 @@ Status ExecuteLaunchApp(Session* session,
|
| return status;
|
|
|
| AutomationExtension* extension = NULL;
|
| - status = desktop->GetAutomationExtension(&extension);
|
| + status = desktop->GetAutomationExtension(&extension, session->w3c_compliant);
|
| if (status.IsError())
|
| return status;
|
|
|
| @@ -293,7 +295,8 @@ Status ExecuteClose(Session* session,
|
| const base::DictionaryValue& params,
|
| std::unique_ptr<base::Value>* value) {
|
| std::list<std::string> web_view_ids;
|
| - Status status = session->chrome->GetWebViewIds(&web_view_ids);
|
| + Status status = session->chrome->GetWebViewIds(&web_view_ids,
|
| + session->w3c_compliant);
|
| if (status.IsError())
|
| return status;
|
| bool is_last_web_view = web_view_ids.size() == 1u;
|
| @@ -308,7 +311,8 @@ Status ExecuteClose(Session* session,
|
| if (status.IsError())
|
| return status;
|
|
|
| - status = session->chrome->GetWebViewIds(&web_view_ids);
|
| + status = session->chrome->GetWebViewIds(&web_view_ids,
|
| + session->w3c_compliant);
|
| if ((status.code() == kChromeNotReachable && is_last_web_view) ||
|
| (status.IsOk() && web_view_ids.empty())) {
|
| // If no window is open, close is the equivalent of calling "quit".
|
| @@ -323,7 +327,8 @@ Status ExecuteGetWindowHandles(Session* session,
|
| const base::DictionaryValue& params,
|
| std::unique_ptr<base::Value>* value) {
|
| std::list<std::string> web_view_ids;
|
| - Status status = session->chrome->GetWebViewIds(&web_view_ids);
|
| + Status status = session->chrome->GetWebViewIds(&web_view_ids,
|
| + session->w3c_compliant);
|
| if (status.IsError())
|
| return status;
|
| std::unique_ptr<base::ListValue> window_ids(new base::ListValue());
|
| @@ -343,7 +348,8 @@ Status ExecuteSwitchToWindow(Session* session,
|
| return Status(kUnknownError, "'name' must be a string");
|
|
|
| std::list<std::string> web_view_ids;
|
| - Status status = session->chrome->GetWebViewIds(&web_view_ids);
|
| + Status status = session->chrome->GetWebViewIds(&web_view_ids,
|
| + session->w3c_compliant);
|
| if (status.IsError())
|
| return status;
|
|
|
| @@ -604,7 +610,8 @@ Status ExecuteSetNetworkConnection(Session* session,
|
| // to ensure that network emulation is applied on a per-session basis
|
| // rather than the just to the current WebView.
|
| std::list<std::string> web_view_ids;
|
| - status = session->chrome->GetWebViewIds(&web_view_ids);
|
| + status = session->chrome->GetWebViewIds(&web_view_ids,
|
| + session->w3c_compliant);
|
| if (status.IsError())
|
| return status;
|
|
|
| @@ -628,7 +635,7 @@ Status ExecuteGetWindowPosition(Session* session,
|
| return status;
|
|
|
| AutomationExtension* extension = NULL;
|
| - status = desktop->GetAutomationExtension(&extension);
|
| + status = desktop->GetAutomationExtension(&extension, session->w3c_compliant);
|
| if (status.IsError())
|
| return status;
|
|
|
| @@ -658,7 +665,7 @@ Status ExecuteSetWindowPosition(Session* session,
|
| return status;
|
|
|
| AutomationExtension* extension = NULL;
|
| - status = desktop->GetAutomationExtension(&extension);
|
| + status = desktop->GetAutomationExtension(&extension, session->w3c_compliant);
|
| if (status.IsError())
|
| return status;
|
|
|
| @@ -674,7 +681,7 @@ Status ExecuteGetWindowSize(Session* session,
|
| return status;
|
|
|
| AutomationExtension* extension = NULL;
|
| - status = desktop->GetAutomationExtension(&extension);
|
| + status = desktop->GetAutomationExtension(&extension, session->w3c_compliant);
|
| if (status.IsError())
|
| return status;
|
|
|
| @@ -705,7 +712,7 @@ Status ExecuteSetWindowSize(Session* session,
|
| return status;
|
|
|
| AutomationExtension* extension = NULL;
|
| - status = desktop->GetAutomationExtension(&extension);
|
| + status = desktop->GetAutomationExtension(&extension, session->w3c_compliant);
|
| if (status.IsError())
|
| return status;
|
|
|
| @@ -722,7 +729,7 @@ Status ExecuteMaximizeWindow(Session* session,
|
| return status;
|
|
|
| AutomationExtension* extension = NULL;
|
| - status = desktop->GetAutomationExtension(&extension);
|
| + status = desktop->GetAutomationExtension(&extension, session->w3c_compliant);
|
| if (status.IsError())
|
| return status;
|
|
|
|
|