Convert ChromeDriver to use only the JSON automation interface.

chrome/test/webdriver/session.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/session_manager.h"
 
 #include <sstream>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 12 matching lines @@
 #include "base/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/platform_thread.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/test/automation/automation_json_requests.h"
 #include "chrome/test/test_launcher_utils.h"
 #include "chrome/test/webdriver/session_manager.h"
 #include "chrome/test/webdriver/utility_functions.h"
 #include "chrome/test/webdriver/webdriver_key_converter.h"
 #include "chrome/test/webdriver/web_element_id.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/webdriver/atoms.h"
 #include "ui/gfx/point.h"
 
 namespace webdriver {
@@ skipping 209 matching lines @@
   bool success = false;
   RunSessionTask(NewRunnableMethod(
       automation_.get(),
       &Automation::GetTabTitle,
       current_window_id_,
       tab_title,
       &success));
   return success;
 }
 
-void Session::MouseClick(const gfx::Point& click, int flags) {
+void Session::MouseClick(const gfx::Point& click,
+                         automation::MouseButton button) {
   bool success = false;
   RunSessionTask(NewRunnableMethod(
       automation_.get(),
       &Automation::MouseClick,
       current_window_id_,
       click,
-      flags,
+      button,
       &success));
 }
 
 bool Session::MouseMove(const gfx::Point& location) {
   bool success = false;
   RunSessionTask(NewRunnableMethod(
       automation_.get(),
       &Automation::MouseMove,
       current_window_id_,
       location,
@@ skipping 22 matching lines @@
       current_window_id_,
       url,
       cookies,
       &success));
   return success;
 }
 
 bool Session::GetCookieByName(const GURL& url,
                               const std::string& cookie_name,
                               std::string* cookie) {
-  bool success = false;
-  RunSessionTask(NewRunnableMethod(
-      automation_.get(),
-      &Automation::GetCookieByName,
-      current_window_id_,
-      url,
-      cookie_name,
-      cookie,
-      &success));
-  return success;
+  std::string cookies;
+  if (!GetCookies(url, &cookies))
+    return false;
+
+  std::string namestr = cookie_name + "=";
+  std::string::size_type idx = cookies.find(namestr);
+  if (idx != std::string::npos) {
+    cookies.erase(0, idx + namestr.length());
+    *cookie = cookies.substr(0, cookies.find(";"));
+  } else {
+    cookie->clear();
+  }
+
+  return true;
 }
 
 bool Session::DeleteCookie(const GURL& url, const std::string& cookie_name) {
   bool success = false;
   RunSessionTask(NewRunnableMethod(
       automation_.get(),
       &Automation::DeleteCookie,
       current_window_id_,
       url,
       cookie_name,
@@ skipping 20 matching lines @@
       &Automation::GetTabIds,
       window_ids,
       &success));
   return success;
 }
 
 ErrorCode Session::SwitchToWindow(const std::string& name) {
   int switch_to_id = 0;
   int name_no = 0;
   if (base::StringToInt(name, &name_no)) {
+    bool success = false;
     bool does_exist = false;
     RunSessionTask(NewRunnableMethod(
         automation_.get(),
         &Automation::DoesTabExist,
         name_no,
-        &does_exist));
+        &does_exist,
+        &success));
+    if (!success) {
+      LOG(ERROR) << "Unable to determine if window exists";
+      return kUnknownError;
+    }
     if (does_exist)
       switch_to_id = name_no;
   }
 
   if (!switch_to_id) {
     std::vector<int> window_ids;
     GetWindowIds(&window_ids);
     // See if any of the window names match |name|.
     for (size_t i = 0; i < window_ids.size(); ++i) {
       ListValue empty_list;
@@ skipping 382 matching lines @@
       }
     } else {
       LOG(ERROR) << "Location atom returned non-dictionary type";
       code = kUnknownError;
     }
   }
   return code;
 }
 
 }  // namespace webdriver