summaryrefslogtreecommitdiffstats
path: root/chrome/test/automation/automation_json_requests.h
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/test/automation/automation_json_requests.h')
-rw-r--r--chrome/test/automation/automation_json_requests.h76
1 files changed, 38 insertions, 38 deletions
diff --git a/chrome/test/automation/automation_json_requests.h b/chrome/test/automation/automation_json_requests.h
index 89b1072..4d855b1 100644
--- a/chrome/test/automation/automation_json_requests.h
+++ b/chrome/test/automation/automation_json_requests.h
@@ -170,7 +170,7 @@ bool SendGetIndicesFromTabIdJSONRequest(
int tab_id,
int* browser_index,
int* tab_index,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests the current browser and tab indices for the given |TabProxy|
// handle. Returns true on success.
@@ -179,7 +179,7 @@ bool SendGetIndicesFromTabHandleJSONRequest(
int tab_proxy_handle,
int* browser_index,
int* tab_index,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests to navigate to the given url and wait for the given number of
// navigations to complete. Returns true on success.
@@ -189,7 +189,7 @@ bool SendNavigateToURLJSONRequest(
const std::string& url,
int navigation_count,
AutomationMsg_NavigationResponseValues* nav_response,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests the given javascript to be executed in the frame specified by the
// given xpath. Returns true on success. If true, |result| will be set to the
@@ -200,28 +200,28 @@ bool SendExecuteJavascriptJSONRequest(
const std::string& frame_xpath,
const std::string& javascript,
base::Value** result,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests the specified view to go forward. Waits for the load to complete.
// Returns true on success.
bool SendGoForwardJSONRequest(
AutomationMessageSender* sender,
const WebViewLocator& locator,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests the specified view to go back. Waits for the load to complete.
// Returns true on success.
bool SendGoBackJSONRequest(
AutomationMessageSender* sender,
const WebViewLocator& locator,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests the specified view to reload. Waits for the load to complete.
// Returns true on success.
bool SendReloadJSONRequest(
AutomationMessageSender* sender,
const WebViewLocator& locator,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests a snapshot of the entire page to be saved to the given path
// in PNG format.
@@ -230,7 +230,7 @@ bool SendCaptureEntirePageJSONRequest(
AutomationMessageSender* sender,
const WebViewLocator& locator,
const FilePath& path,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests all the cookies for the given URL. On success returns true and
// caller takes ownership of |cookies|, which is a list of all the cookies in
@@ -239,7 +239,7 @@ bool SendGetCookiesJSONRequest(
AutomationMessageSender* sender,
const std::string& url,
base::ListValue** cookies,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests deletion of the cookie with the given name and URL. Returns true
// on success.
@@ -247,7 +247,7 @@ bool SendDeleteCookieJSONRequest(
AutomationMessageSender* sender,
const std::string& url,
const std::string& cookie_name,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests setting the given cookie for the given URL. Returns true on
// success. The caller retains ownership of |cookie_dict|.
@@ -255,26 +255,26 @@ bool SendSetCookieJSONRequest(
AutomationMessageSender* sender,
const std::string& url,
base::DictionaryValue* cookie_dict,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests the IDs for all open tabs. Returns true on success.
bool SendGetTabIdsJSONRequest(
AutomationMessageSender* sender,
std::vector<WebViewInfo>* views,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests info for all open views. Returns true on success.
bool SendGetWebViewsJSONRequest(
AutomationMessageSender* sender,
std::vector<WebViewInfo>* views,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests whether the given tab ID is valid. Returns true on success.
bool SendIsTabIdValidJSONRequest(
AutomationMessageSender* sender,
const WebViewId& view_id,
bool* is_valid,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests whether the given automation ID refers to an actual automation
// object. Returns true on success.
@@ -282,13 +282,13 @@ bool SendDoesAutomationObjectExistJSONRequest(
AutomationMessageSender* sender,
const WebViewId& view_id,
bool* does_exist,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests to close the given view. Returns true on success.
bool SendCloseViewJSONRequest(
AutomationMessageSender* sender,
const WebViewLocator& locator,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests to send the WebKit event for a mouse move to the given
// coordinate in the specified view. Returns true on success.
@@ -297,7 +297,7 @@ bool SendMouseMoveJSONRequest(
const WebViewLocator& locator,
int x,
int y,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests to send the WebKit events for a mouse click at the given
// coordinate in the specified view. Returns true on success.
@@ -307,7 +307,7 @@ bool SendMouseClickJSONRequest(
automation::MouseButton button,
int x,
int y,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests to send the WebKit events for a mouse drag from the start to end
// coordinates given in the specified view. Returns true on success.
@@ -318,7 +318,7 @@ bool SendMouseDragJSONRequest(
int start_y,
int end_x,
int end_y,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests to send the WebKit event for a mouse button down at the given
// coordinate in the specified view. Returns true on success.
@@ -327,7 +327,7 @@ bool SendMouseButtonDownJSONRequest(
const WebViewLocator& locator,
int x,
int y,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests to send the WebKit event for a mouse button up at the given
// coordinate in the specified view. Returns true on success.
@@ -336,7 +336,7 @@ bool SendMouseButtonUpJSONRequest(
const WebViewLocator& locator,
int x,
int y,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests to send the WebKit event for a mouse double click at the given
// coordinate in the specified view. Returns true on success.
@@ -345,7 +345,7 @@ bool SendMouseDoubleClickJSONRequest(
const WebViewLocator& locator,
int x,
int y,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests to send the WebKit event for the given |WebKeyEvent| in a
// specified view. Returns true on success.
@@ -353,7 +353,7 @@ bool SendWebKeyEventJSONRequest(
AutomationMessageSender* sender,
const WebViewLocator& locator,
const WebKeyEvent& key_event,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests to send the key event for the given keycode+modifiers to a
// browser window containing the specified view. Returns true on success.
@@ -362,7 +362,7 @@ bool SendNativeKeyEventJSONRequest(
const WebViewLocator& locator,
ui::KeyboardCode key_code,
int modifiers,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests to drag and drop the file paths at the given coordinate in the
// specified view. Returns true on success.
@@ -372,40 +372,40 @@ bool SendDragAndDropFilePathsJSONRequest(
int x,
int y,
const std::vector<FilePath::StringType>& paths,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests to get the active JavaScript modal dialog's message. Returns true
// on success.
bool SendGetAppModalDialogMessageJSONRequest(
AutomationMessageSender* sender,
std::string* message,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests to accept or dismiss the active JavaScript modal dialog.
// Returns true on success.
bool SendAcceptOrDismissAppModalDialogJSONRequest(
AutomationMessageSender* sender,
bool accept,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests to accept the active JavaScript modal dialog with the given prompt
// text. Returns true on success.
bool SendAcceptPromptAppModalDialogJSONRequest(
AutomationMessageSender* sender,
const std::string& prompt_text,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests to wait for all views to stop loading. Returns true on success.
bool SendWaitForAllViewsToStopLoadingJSONRequest(
AutomationMessageSender* sender,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests the version of ChromeDriver automation supported by the automation
// server. Returns true on success.
bool SendGetChromeDriverAutomationVersion(
AutomationMessageSender* sender,
int* version,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests that the given extension be installed. If |with_ui| is false,
// the extension will be installed silently. Returns true on success.
@@ -414,13 +414,13 @@ bool SendInstallExtensionJSONRequest(
const FilePath& path,
bool with_ui,
std::string* extension_id,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests info about all installed extensions. Returns true on success.
bool SendGetExtensionsInfoJSONRequest(
AutomationMessageSender* sender,
base::ListValue* extensions_list,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests whether the given extension's page action is visible in the
// given tab.
@@ -429,7 +429,7 @@ bool SendIsPageActionVisibleJSONRequest(
const WebViewId& tab_id,
const std::string& extension_id,
bool* is_visible,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests a modification of the given extension state. Returns true on
// success.
@@ -438,7 +438,7 @@ bool SendSetExtensionStateJSONRequest(
const std::string& extension_id,
bool enable,
bool allow_in_incognito,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests the given extension's action button be pressed. Returns true on
// success.
@@ -446,13 +446,13 @@ bool SendClickExtensionButtonJSONRequest(
AutomationMessageSender* sender,
const std::string& extension_id,
bool browser_action,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests the given extension be uninstalled. Returns true on success.
bool SendUninstallExtensionJSONRequest(
AutomationMessageSender* sender,
const std::string& extension_id,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests the local state preference to be set to the given value.
// Ownership of |value| is taken by this function. Returns true on success.
@@ -460,7 +460,7 @@ bool SendSetLocalStatePreferenceJSONRequest(
AutomationMessageSender* sender,
const std::string& pref,
base::Value* value,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
// Requests the user preference to be set to the given value.
// Ownership of |value| is taken by this function. Returns true on success.
@@ -468,6 +468,6 @@ bool SendSetPreferenceJSONRequest(
AutomationMessageSender* sender,
const std::string& pref,
base::Value* value,
- std::string* error_msg) WARN_UNUSED_RESULT;
+ automation::Error* error) WARN_UNUSED_RESULT;
#endif // CHROME_TEST_AUTOMATION_AUTOMATION_JSON_REQUESTS_H_