Convert ChromeDriver to use only the JSON automation interface.

chrome/test/automation/automation_json_requests.h

Index: chrome/test/automation/automation_json_requests.h
diff --git a/chrome/test/automation/automation_json_requests.h b/chrome/test/automation/automation_json_requests.h
index 667c6af3363fdf927ecfdd4135c5a5bb4607acf2..0ed53e200e03a11b4ce622954f6136b1b6a9f865 100644
--- a/chrome/test/automation/automation_json_requests.h
+++ b/chrome/test/automation/automation_json_requests.h
@@ -7,12 +7,29 @@
 #pragma once
 
 #include <string>
+#include <vector>
 
 #include "base/compiler_specific.h"
 #include "chrome/common/automation_constants.h"
+#include "ui/base/keycodes/keyboard_codes.h"
 
 class AutomationMessageSender;
 class GURL;
+class Value;
+
+struct WebKeyEvent {
+  WebKeyEvent(automation::KeyEventTypes type,
+              ui::KeyboardCode key_code,
+              const std::string& unmodified_text,
+              const std::string& modified_text,
+              int modifiers);
+
+  automation::KeyEventTypes type;
+  ui::KeyboardCode key_code;
+  std::string unmodified_text;
+  std::string modified_text;
+  int modifiers;
+};
 
 // Sends a JSON request to the chrome automation provider. Returns true
 // if the JSON request was successfully sent and the reply was received.
@@ -23,11 +40,12 @@ bool SendAutomationJSONRequest(AutomationMessageSender* sender,
                                std::string* reply,
                                bool* success) WARN_UNUSED_RESULT;
 
-// Requests the current browser and tab indices for the given |TabProxy|
-// handle. Returns true on success.
+// Requests the current browser and tab indices for the given tab ID or
+// |TabProxy| handle. Returns true on success.
 bool SendGetIndicesFromTabJSONRequest(
     AutomationMessageSender* sender,
-    int handle,
+    int id_or_handle,

[Paweł Hajdan Jr., 2011/03/05 11:44:56]

This looks like a very unintuitive interface. Can you find a cleaner way?

[kkania, 2011/03/07 04:31:51]

Ok, I separated into two functions.

+    bool is_id,
     int* browser_index,
     int* tab_index) WARN_UNUSED_RESULT;
 
@@ -41,4 +59,132 @@ bool SendNavigateToURLJSONRequest(
     int navigation_count,
     AutomationMsg_NavigationResponseValues* nav_response) 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
+// result of the execution and ownership will be given to the caller.
+bool SendExecuteJavascriptJSONRequest(
+    AutomationMessageSender* sender,
+    int browser_index,
+    int tab_index,
+    const std::string& frame_xpath,
+    const std::string& javascript,
+    Value** result) WARN_UNUSED_RESULT;
+
+// Requests the specified tab to go forward. Waits for the load to complete.
+// Returns true on success.
+bool SendGoForwardJSONRequest(
+    AutomationMessageSender* sender,
+    int browser_index,
+    int tab_index) WARN_UNUSED_RESULT;
+
+// Requests the specified tab to go back. Waits for the load to complete.
+// Returns true on success.
+bool SendGoBackJSONRequest(
+    AutomationMessageSender* sender,
+    int browser_index,
+    int tab_index) WARN_UNUSED_RESULT;
+
+// Requests the specified tab to reload. Waits for the load to complete.
+// Returns true on success.
+bool SendReloadJSONRequest(
+    AutomationMessageSender* sender,
+    int browser_index,
+    int tab_index) WARN_UNUSED_RESULT;
+
+// Requests the url of the specified tab. Returns true on success.
+bool SendGetTabURLJSONRequest(
+    AutomationMessageSender* sender,
+    int browser_index,
+    int tab_index,
+    std::string* url) WARN_UNUSED_RESULT;
+
+// Requests the title of the specified tab. Returns true on success.
+bool SendGetTabTitleJSONRequest(
+    AutomationMessageSender* sender,
+    int browser_index,
+    int tab_index,
+    std::string* tab_title) WARN_UNUSED_RESULT;
+
+// Requests all the cookies for the given URL. Returns true on success.
+bool SendGetCookiesJSONRequest(
+    AutomationMessageSender* sender,
+    int browser_index,
+    const std::string& url,
+    std::string* cookies) WARN_UNUSED_RESULT;
+
+// Requests deletion of the cookie with the given name and URL. Returns true
+// on success.
+bool SendDeleteCookieJSONRequest(
+    AutomationMessageSender* sender,
+    int browser_index,
+    const std::string& url,
+    const std::string& cookie_name) WARN_UNUSED_RESULT;
+
+// Requests setting the given cookie for the given URL. Returns true on
+// success.
+bool SendSetCookieJSONRequest(
+    AutomationMessageSender* sender,
+    int browser_index,
+    const std::string& url,
+    const std::string& cookie) WARN_UNUSED_RESULT;
+
+// Requests the IDs for all open tabs. Returns true on success.
+bool SendGetTabIdsJSONRequest(
+    AutomationMessageSender* sender,
+    std::vector<int>* tab_ids) WARN_UNUSED_RESULT;
+
+// Requests whether the given tab ID is valid. Returns true on success.
+bool SendIsTabIdValidJSONRequest(
+    AutomationMessageSender* sender,
+    int tab_id,
+    bool* is_valid) WARN_UNUSED_RESULT;
+
+// Requests to close the given tab. Returns true on success.
+bool SendCloseTabJSONRequest(
+    AutomationMessageSender* sender,
+    int browser_index,
+    int tab_index) WARN_UNUSED_RESULT;
+
+// Requests to send the WebKit event for a mouse move to the given
+// coordinate in the specified tab. Returns true on success.
+bool SendMouseMoveJSONRequest(
+    AutomationMessageSender* sender,
+    int browser_index,
+    int tab_index,
+    int x,
+    int y) WARN_UNUSED_RESULT;
+
+// Requests to send the WebKit events for a mouse click at the given
+// coordinate in the specified tab. Returns true on success.
+bool SendMouseClickJSONRequest(
+    AutomationMessageSender* sender,
+    int browser_index,
+    int tab_index,
+    automation::MouseButton button,
+    int x,
+    int y) WARN_UNUSED_RESULT;
+
+// Requests to send the WebKit events for a mouse drag from the start to end
+// coordinates given in the specified tab. Returns true on success.
+bool SendMouseDragJSONRequest(
+    AutomationMessageSender* sender,
+    int browser_index,
+    int tab_index,
+    int start_x,
+    int start_y,
+    int end_x,
+    int end_y) WARN_UNUSED_RESULT;
+
+// Requests to send the WebKit event for the given |WebKeyEvent| in a
+// specified tab. Returns true on success.
+bool SendWebKeyEventJSONRequest(
+    AutomationMessageSender* sender,
+    int browser_index,
+    int tab_index,
+    const WebKeyEvent& key_event) WARN_UNUSED_RESULT;
+
+// Requests to wait for all tabs to stop loading. Returns true on success.
+bool SendWaitForAllTabsToStopLoadingJSONRequest(
+    AutomationMessageSender* sender) WARN_UNUSED_RESULT;
+
 #endif  // CHROME_TEST_AUTOMATION_AUTOMATION_JSON_REQUESTS_H_