| Index: chrome/test/chromedriver/session_commands.cc
|
| diff --git a/chrome/test/chromedriver/session_commands.cc b/chrome/test/chromedriver/session_commands.cc
|
| index 64d9e97dc7f79c78889ab6fae712a056951e9a77..aa2aaafa3db9e40baf270901d7054577c33ec21d 100644
|
| --- a/chrome/test/chromedriver/session_commands.cc
|
| +++ b/chrome/test/chromedriver/session_commands.cc
|
| @@ -215,11 +215,13 @@ 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;
|
|
|
| - status = session->chrome->GetWebViewIdForFirstTab(&session->window);
|
| + status = session->chrome->GetWebViewIdForFirstTab(&session->window,
|
| + session->w3c_compliant);
|
| if (status.IsError())
|
| return status;
|
|
|
| @@ -289,7 +291,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;
|
|
|
| @@ -300,7 +302,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;
|
| @@ -315,7 +318,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".
|
| @@ -330,7 +334,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());
|
| @@ -350,7 +355,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;
|
|
|
| @@ -611,7 +617,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;
|
|
|
| @@ -635,7 +642,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;
|
|
|
| @@ -665,7 +672,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;
|
|
|
| @@ -681,7 +688,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;
|
|
|
| @@ -712,7 +719,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;
|
|
|
| @@ -729,7 +736,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;
|
|
|
|
|