Convert ChromeDriver to use only the JSON automation interface.

chrome/browser/automation/automation_provider_json.h

Index: chrome/browser/automation/automation_provider_json.h
diff --git a/chrome/browser/automation/automation_provider_json.h b/chrome/browser/automation/automation_provider_json.h
index 26b85810b415139f1a6002adca6b353da83a5b9e..1febeaab271b075123a2282b11a2b99f54befb66 100644
--- a/chrome/browser/automation/automation_provider_json.h
+++ b/chrome/browser/automation/automation_provider_json.h
@@ -10,8 +10,11 @@
 
 #include <string>
 
-class Value;
 class AutomationProvider;
+class Browser;
+class DictionaryValue;
+class TabContents;
+class Value;
 
 namespace IPC {
 class Message;
@@ -40,4 +43,28 @@ class AutomationJSONReply {
   IPC::Message* message_;
 };
 
+// Gets the browser specified by the given dictionary |args|. 'windex' should

[Paweł Hajdan Jr., 2011/03/07 21:03:39]

nit: There is no |windex| parameter. My understanding is that it should be a key
in the dict. Could you update the comment to avoid any confusion? It applies to
all new functions in this header.

[kkania, 2011/03/07 21:57:51]

Done.

+// refer to the index of the browser. Returns true on success and sets
+// |browser|. Otherwise, |error| will be set.
+bool GetBrowserFromJSONArgs(DictionaryValue* args,

[Paweł Hajdan Jr., 2011/03/07 21:03:39]

nit: Bonus points for WARN_UNUSED_RESULT from base/compiler_specific.h.

[kkania, 2011/03/07 21:57:51]

Done.

+                            Browser** browser,
+                            std::string* error);
+
+// Gets the tab specified by the given dictionary |args|. 'windex' should
+// refer to the index of the parent browser, and 'tab_index' should refer
+// to the index of the tab in that browser. Returns true on success and sets
+// |tab|. Otherwise, |error| will be set.
+bool GetTabFromJSONArgs(DictionaryValue* args,
+                        TabContents** tab,
+                        std::string* error);
+
+// Gets the browser and tab specified by the given dictionary |args|. 'windex'
+// should refer to the index of the browser, and 'tab_index' should refer
+// to the index of the tab in that browser. Returns true on success and sets
+// |browser| and |tab|. Otherwise, |error| will be set.
+bool GetBrowserAndTabFromJSONArgs(DictionaryValue* args,
+                                  Browser** browser,
+                                  TabContents** tab,
+                                  std::string* error);
+
 #endif  // CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_JSON_H_