Convert ChromeDriver to use only the JSON automation interface.

chrome/browser/automation/automation_provider_json.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Support utilities for the JSON automation interface used by PyAuto.
 
 #ifndef CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_JSON_H_
 #define CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_JSON_H_
 #pragma once
 
 #include <string>
 
+class AutomationProvider;
+class Browser;
+class DictionaryValue;
+class TabContents;
 class Value;
-class AutomationProvider;
 
 namespace IPC {
 class Message;
 }
 
 // Helper to ensure we always send a reply message for JSON automation requests.
 class AutomationJSONReply {
  public:
   // Creates a new reply object for the IPC message |reply_message| for
   // |provider|. The caller is expected to call SendSuccess() or SendError()
   // before destroying this object.
   AutomationJSONReply(AutomationProvider* provider,
                       IPC::Message* reply_message);
 
   ~AutomationJSONReply();
 
   // Send a success reply along with data contained in |value|.
   // An empty message will be sent if |value| is NULL.
   void SendSuccess(const Value* value);
 
   // Send an error reply along with error message |error_message|.
   void SendError(const std::string& error_message);
 
  private:
   AutomationProvider* provider_;
   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_