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

chrome/test/webdriver/commands/webelement_commands.cc

 // 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.
 
 #include "chrome/test/webdriver/commands/webelement_commands.h"
 
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/third_party/icu/icu_utf.h"
 #include "base/values.h"
 #include "chrome/test/webdriver/commands/response.h"
 #include "chrome/test/webdriver/session.h"
+#include "chrome/test/webdriver/webdriver_basic_types.h"
 #include "chrome/test/webdriver/webdriver_error.h"
 #include "third_party/webdriver/atoms.h"
-#include "ui/gfx/point.h"
-#include "ui/gfx/size.h"
 
 namespace webdriver {
 
 ///////////////////// WebElementCommand ////////////////////
 
 WebElementCommand::WebElementCommand(
     const std::vector<std::string>& path_segments,
     const DictionaryValue* const parameters)
     : WebDriverCommand(path_segments, parameters),
       path_segments_(path_segments) {}
@@ skipping 243 matching lines @@
     DictionaryValue* parameters)
     : WebElementCommand(path_segments, parameters) {}
 
 ElementLocationInViewCommand::~ElementLocationInViewCommand() {}
 
 bool ElementLocationInViewCommand::DoesGet() {
   return true;
 }
 
 void ElementLocationInViewCommand::ExecuteGet(Response* const response) {
-  gfx::Point location;
+  Point location;
   Error* error = session_->GetElementLocationInView(element, &location);
   if (error) {
     response->SetError(error);
     return;
   }
   DictionaryValue* coord_dict = new DictionaryValue();
   coord_dict->SetInteger("x", location.x());
   coord_dict->SetInteger("y", location.y());
   response->SetValue(coord_dict);
 }
@@ skipping 66 matching lines @@
     DictionaryValue* parameters)
     : WebElementCommand(path_segments, parameters) {}
 
 ElementSizeCommand::~ElementSizeCommand() {}
 
 bool ElementSizeCommand::DoesGet() {
   return true;
 }
 
 void ElementSizeCommand::ExecuteGet(Response* const response) {
-  gfx::Size size;
+  Size size;
   Error* error = session_->GetElementSize(
       session_->current_target(), element, &size);
   if (error) {
     response->SetError(error);
     return;
   }
   DictionaryValue* dict = new DictionaryValue();
   dict->SetInteger("width", size.width());
   dict->SetInteger("height", size.height());
   response->SetValue(dict);
@@ skipping 177 matching lines @@
     if (!file_util::PathExists(FilePath(path))) {
       return new Error(
           kBadRequest,
           base::StringPrintf("'%s' does not exist on the file system",
                              path.c_str()));
     }
 
     paths.push_back(path);
   }
 
-  gfx::Point location;
+  Point location;
   error = session_->GetClickableLocation(element, &location);
   if (error) {
     return error;
   }
 
   return session_->DragAndDropFilePaths(location, paths);
 }
 
 Error* ElementValueCommand::SendKeys() const {
   ListValue* key_list;
@@ skipping 47 matching lines @@
     return;
   }
   if (!result->IsType(Value::TYPE_STRING)) {
     response->SetError(new Error(kUnknownError, "Result is not string type"));
     return;
   }
   response->SetValue(result.release());
 }
 
 }  // namespace webdriver