| Index: chrome/test/chromedriver/session_commands.cc
|
| diff --git a/chrome/test/chromedriver/session_commands.cc b/chrome/test/chromedriver/session_commands.cc
|
| index a2f088c2b892cb1aac3a4395beea4a621c71aafe..dadc666e783da1eebd75f821fe9617abe2a71a85 100644
|
| --- a/chrome/test/chromedriver/session_commands.cc
|
| +++ b/chrome/test/chromedriver/session_commands.cc
|
| @@ -289,90 +289,6 @@ Status ExecuteImplicitlyWait(
|
| return Status(kOk);
|
| }
|
|
|
| -Status ExecuteAlertCommand(
|
| - const SessionCommand& alert_command,
|
| - Session* session,
|
| - const base::DictionaryValue& params,
|
| - scoped_ptr<base::Value>* value) {
|
| - WebView* web_view = NULL;
|
| - Status status = session->GetTargetWindow(&web_view);
|
| - if (status.IsError())
|
| - return status;
|
| -
|
| - status = web_view->ConnectIfNecessary();
|
| - if (status.IsError())
|
| - return status;
|
| -
|
| - status = web_view->WaitForPendingNavigations(session->GetCurrentFrameId());
|
| - if (status.IsError() && status.code() != kUnexpectedAlertOpen)
|
| - return status;
|
| -
|
| - return alert_command.Run(session, params, value);
|
| -}
|
| -
|
| -Status ExecuteGetAlert(
|
| - Session* session,
|
| - const base::DictionaryValue& params,
|
| - scoped_ptr<base::Value>* value) {
|
| - bool is_open;
|
| - Status status = session->chrome->IsJavaScriptDialogOpen(&is_open);
|
| - if (status.IsError())
|
| - return status;
|
| - value->reset(base::Value::CreateBooleanValue(is_open));
|
| - return Status(kOk);
|
| -}
|
| -
|
| -Status ExecuteGetAlertText(
|
| - Session* session,
|
| - const base::DictionaryValue& params,
|
| - scoped_ptr<base::Value>* value) {
|
| - std::string message;
|
| - Status status = session->chrome->GetJavaScriptDialogMessage(&message);
|
| - if (status.IsError())
|
| - return status;
|
| - value->reset(base::Value::CreateStringValue(message));
|
| - return Status(kOk);
|
| -}
|
| -
|
| -Status ExecuteSetAlertValue(
|
| - Session* session,
|
| - const base::DictionaryValue& params,
|
| - scoped_ptr<base::Value>* value) {
|
| - std::string text;
|
| - if (!params.GetString("text", &text))
|
| - return Status(kUnknownError, "missing or invalid 'text'");
|
| -
|
| - bool is_open;
|
| - Status status = session->chrome->IsJavaScriptDialogOpen(&is_open);
|
| - if (status.IsError())
|
| - return status;
|
| - if (!is_open)
|
| - return Status(kNoAlertOpen);
|
| -
|
| - session->prompt_text.reset(new std::string(text));
|
| - return Status(kOk);
|
| -}
|
| -
|
| -Status ExecuteAcceptAlert(
|
| - Session* session,
|
| - const base::DictionaryValue& params,
|
| - scoped_ptr<base::Value>* value) {
|
| - Status status = session->chrome->HandleJavaScriptDialog(
|
| - true, session->prompt_text.get());
|
| - session->prompt_text.reset();
|
| - return status;
|
| -}
|
| -
|
| -Status ExecuteDismissAlert(
|
| - Session* session,
|
| - const base::DictionaryValue& params,
|
| - scoped_ptr<base::Value>* value) {
|
| - Status status = session->chrome->HandleJavaScriptDialog(
|
| - false, session->prompt_text.get());
|
| - session->prompt_text.reset();
|
| - return status;
|
| -}
|
| -
|
| Status ExecuteIsLoading(
|
| Session* session,
|
| const base::DictionaryValue& params,
|
|
|