Refactor chromedriver's script execution to reduce amount of custom Value parsing.

chrome/test/webdriver/automation.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_TEST_WEBDRIVER_AUTOMATION_H_
 #define CHROME_TEST_WEBDRIVER_AUTOMATION_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/task.h"
 #include "chrome/common/automation_constants.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 
 class AutomationProxy;
 class ProxyLauncher;
 struct WebKeyEvent;
 
 namespace base {
 class DictionaryValue;
 class ListValue;
 }
 
-namespace gfx {
-class Point;
-}
-
 namespace webdriver {
 
 class Error;
 class FramePath;
+class Point;
 
 // Creates and controls the Chrome instance.
 // This class should be created and accessed on a single thread.
 // Note: All member functions are void because they are invoked
 // by posting a task from NewRunnableMethod.
 class Automation {
  public:
   struct BrowserOptions {
     BrowserOptions();
     ~BrowserOptions();
@@ skipping 29 matching lines @@
 
   // Sends an OS level key event to the current browser. Waits until the key
   // has been processed by the browser.
   void SendNativeKeyEvent(int tab_id,
                           ui::KeyboardCode key_code,
                           int modifiers,
                           Error** error);
 
   // Drag and drop the file paths to the given location.
   void DragAndDropFilePaths(int tab_id,
-                            const gfx::Point& location,
+                            const Point& location,
                             const std::vector<FilePath::StringType>& paths,
                             Error** error);
 
   // Captures a snapshot of the tab to the specified path.  The  PNG will
   // contain the entire page, including what is not in the current view
   // on the  screen.
   void CaptureEntirePageAsPNG(int tab_id, const FilePath& path, Error** error);
 
   void NavigateToURL(int tab_id, const std::string& url, Error** error);
   void NavigateToURLAsync(int tab_id, const std::string& url, Error** error);
   void GoForward(int tab_id, Error** error);
   void GoBack(int tab_id, Error** error);
   void Reload(int tab_id, Error** error);
 
   void GetCookies(const std::string& url,
                   base::ListValue** cookies,
                   Error** error);
   void DeleteCookie(const std::string& url,
                     const std::string& cookie_name,
                     Error** error);
   void SetCookie(const std::string& url,
                  base::DictionaryValue* cookie_dict,
                  Error** error);
 
-  void MouseMove(int tab_id, const gfx::Point& p, Error** error);
+  void MouseMove(int tab_id, const Point& p, Error** error);
   void MouseClick(int tab_id,
-                  const gfx::Point& p,
+                  const Point& p,
                   automation::MouseButton button,
                   Error** error);
   void MouseDrag(int tab_id,
-                 const gfx::Point& start,
-                 const gfx::Point& end,
+                 const Point& start,
+                 const Point& end,
                  Error** error);
-  void MouseButtonDown(int tab_id, const gfx::Point& p, Error** error);
-  void MouseButtonUp(int tab_id, const gfx::Point& p, Error** error);
-  void MouseDoubleClick(int tab_id, const gfx::Point& p, Error** error);
+  void MouseButtonDown(int tab_id, const Point& p, Error** error);
+  void MouseButtonUp(int tab_id, const Point& p, Error** error);
+  void MouseDoubleClick(int tab_id, const Point& p, Error** error);
 
   // Get persistent IDs for all the tabs currently open. These IDs can be used
   // to identify the tab as long as the tab exists.
   void GetTabIds(std::vector<int>* tab_ids, Error** error);
 
   // Check if the given tab exists currently.
   void DoesTabExist(int tab_id, bool* does_exist, Error** error);
 
   void CloseTab(int tab_id, Error** error);
 
@@ skipping 36 matching lines @@
   scoped_ptr<ProxyLauncher> launcher_;
 
   DISALLOW_COPY_AND_ASSIGN(Automation);
 };
 
 }  // namespace webdriver
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(webdriver::Automation);
 
 #endif  // CHROME_TEST_WEBDRIVER_AUTOMATION_H_