Modified IE driver server to more closely follow W3C spec

This commit includes a number of changes designed to bring the IE driver
into closer alignment with the W3C WebDriver specification. It provides
no functional changes to the driver, nor does it change any external-
facing API. The changes are:
 * Changed webdriver::Server to examine the response from the newSession
   command for the session ID rather than a two-stage process. The
   webdriver::Server::DispatchCommand method now calls the
   InitializeSession method directly when processing the newSession
   command.
 * Removed the now-obsolete webdriver::Server::CreateSession method.
 * Added a Serialize/Deserialize method pair on the webdriver::Command
   class (renaming the Populate method to Deserialize).
 * Revamped the serialization of webdriver::Command to use 'name' instead
   of 'command' for the command name.
 * Added a session ID member to the webdriver::Command object.
 * Modified the webdriver::Command object to no longer draw distinction
   between parameters passed in as part of the URL substitution and those
   passed in as part of the JSON payload in the body.
 * Modified webdriver::CommandHandler::ExecuteInternal (and all subclass
   implementations to use a single parameters map instead of the dual
   URL tokens/JSON payload parameters maps used previously.

cpp/iedriver/CommandHandlers/AcceptAlertCommandHandler.h

@@ -31,7 +31,6 @@ class AcceptAlertCommandHandler : public IECommandHandler {
 
  protected:
   void ExecuteInternal(const IECommandExecutor& executor,
-                       const LocatorMap& locator_parameters,
                        const ParametersMap& command_parameters,
                        Response* response) {
     BrowserHandle browser_wrapper;

cpp/iedriver/CommandHandlers/AddCookieCommandHandler.h

@@ -31,7 +31,6 @@ class AddCookieCommandHandler : public IECommandHandler {
 
  protected:
   void ExecuteInternal(const IECommandExecutor& executor,
-                       const LocatorMap& locator_parameters,
                        const ParametersMap& command_parameters,
                        Response* response) {
     ParametersMap::const_iterator cookie_parameter_iterator = command_parameters.find("cookie");

cpp/iedriver/CommandHandlers/ClearElementCommandHandler.h

@@ -31,16 +31,15 @@ class ClearElementCommandHandler : public IECommandHandler {
 
  protected:
   void ExecuteInternal(const IECommandExecutor& executor,
-                       const LocatorMap& locator_parameters,
                        const ParametersMap& command_parameters,
                        Response* response) {
-    LocatorMap::const_iterator id_parameter_iterator = locator_parameters.find("id");
-    if (id_parameter_iterator == locator_parameters.end()) {
+    ParametersMap::const_iterator id_parameter_iterator = command_parameters.find("id");
+    if (id_parameter_iterator == command_parameters.end()) {
       response->SetErrorResponse(400, "Missing parameter in URL: id");
       return;
     } else {
       int status_code = WD_SUCCESS;
-      std::string element_id = id_parameter_iterator->second;
+      std::string element_id = id_parameter_iterator->second.asString();
 
       BrowserHandle browser_wrapper;
       status_code = executor.GetCurrentBrowser(&browser_wrapper);

cpp/iedriver/CommandHandlers/ClickElementCommandHandler.h

@@ -34,16 +34,15 @@ class ClickElementCommandHandler : public IECommandHandler {
 
  protected:
   void ExecuteInternal(const IECommandExecutor& executor,
-                       const LocatorMap& locator_parameters,
                        const ParametersMap& command_parameters,
                        Response* response) {
-    LocatorMap::const_iterator id_parameter_iterator = locator_parameters.find("id");
-    if (id_parameter_iterator == locator_parameters.end()) {
+    ParametersMap::const_iterator id_parameter_iterator = command_parameters.find("id");
+    if (id_parameter_iterator == command_parameters.end()) {
       response->SetErrorResponse(400, "Missing parameter in URL: id");
       return;
     } else {
       int status_code = WD_SUCCESS;
-      std::string element_id = id_parameter_iterator->second;
+      std::string element_id = id_parameter_iterator->second.asString();
 
       BrowserHandle browser_wrapper;
       status_code = executor.GetCurrentBrowser(&browser_wrapper);

cpp/iedriver/CommandHandlers/CloseWindowCommandHandler.h

@@ -30,7 +30,6 @@ class CloseWindowCommandHandler : public IECommandHandler {
 
  protected:
   void ExecuteInternal(const IECommandExecutor& executor,
-                       const LocatorMap& locator_parameters,
                        const ParametersMap& command_parameters,
                        Response* response) {
     // The session should end if the user sends a quit command,

cpp/iedriver/CommandHandlers/DeleteAllCookiesCommandHandler.h

@@ -30,7 +30,6 @@ class DeleteAllCookiesCommandHandler : public IECommandHandler {
 
  protected:
   void ExecuteInternal(const IECommandExecutor& executor,
-                       const LocatorMap& locator_parameters,
                        const ParametersMap& command_parameters,
                        Response* response) {
     BrowserHandle browser_wrapper;

cpp/iedriver/CommandHandlers/DeleteCookieCommandHandler.h

@@ -30,16 +30,15 @@ class DeleteCookieCommandHandler : public IECommandHandler {
 
  protected:
   void ExecuteInternal(const IECommandExecutor& executor,
-                       const LocatorMap& locator_parameters,
                        const ParametersMap& command_parameters,
                        Response* response) {
-    LocatorMap::const_iterator name_parameter_iterator = locator_parameters.find("name");
-    if (name_parameter_iterator == locator_parameters.end()) {
+    ParametersMap::const_iterator name_parameter_iterator = command_parameters.find("name");
+    if (name_parameter_iterator == command_parameters.end()) {
       response->SetErrorResponse(400, "Missing parameter in URL: name");
       return;
     }
 
-    std::string cookie_name = name_parameter_iterator->second;
+    std::string cookie_name = name_parameter_iterator->second.asString();
     BrowserHandle browser_wrapper;
     int status_code = executor.GetCurrentBrowser(&browser_wrapper);
     if (status_code != WD_SUCCESS) {

cpp/iedriver/CommandHandlers/DismissAlertCommandHandler.h

@@ -30,7 +30,6 @@ class DismissAlertCommandHandler : public AcceptAlertCommandHandler {
 
  protected:
   void ExecuteInternal(const IECommandExecutor& executor,
-                       const LocatorMap& locator_parameters,
                        const ParametersMap& command_parameters,
                        Response* response) {
     BrowserHandle browser_wrapper;

cpp/iedriver/CommandHandlers/ElementEqualsCommandHandler.h

@@ -30,21 +30,20 @@ class ElementEqualsCommandHandler : public IECommandHandler {
 
 protected:
   void ExecuteInternal(const IECommandExecutor& executor,
-                       const LocatorMap& locator_parameters,
                        const ParametersMap& command_parameters,
                        Response* response) {
-    LocatorMap::const_iterator id_parameter_iterator = locator_parameters.find("id");
-    LocatorMap::const_iterator other_parameter_iterator = locator_parameters.find("other");
-    if (id_parameter_iterator == locator_parameters.end()) {
+    ParametersMap::const_iterator id_parameter_iterator = command_parameters.find("id");
+    ParametersMap::const_iterator other_parameter_iterator = command_parameters.find("other");
+    if (id_parameter_iterator == command_parameters.end()) {
       response->SetErrorResponse(400, "Missing parameter in URL: id");
       return;
     }
-    else if (other_parameter_iterator == locator_parameters.end()) {
+    else if (other_parameter_iterator == command_parameters.end()) {
       response->SetErrorResponse(400, "Missing parameter in URL: other");
       return;
     } else {
-      std::string element_id = id_parameter_iterator->second;
-      std::string other_element_id = other_parameter_iterator->second;
+      std::string element_id = id_parameter_iterator->second.asString();
+      std::string other_element_id = other_parameter_iterator->second.asString();
 
       BrowserHandle browser_wrapper;
       int status_code = executor.GetCurrentBrowser(&browser_wrapper);

cpp/iedriver/CommandHandlers/ExecuteAsyncScriptCommandHandler.h

@@ -33,7 +33,6 @@ class ExecuteAsyncScriptCommandHandler : public ExecuteScriptCommandHandler {
 
  protected:
   void ExecuteInternal(const IECommandExecutor& executor,
-                       const LocatorMap& locator_parameters,
                        const ParametersMap& command_parameters,
                        Response* response) {
     ParametersMap::const_iterator script_parameter_iterator = command_parameters.find("script");

cpp/iedriver/CommandHandlers/ExecuteScriptCommandHandler.h

@@ -30,7 +30,6 @@ class ExecuteScriptCommandHandler : public IECommandHandler {
 
  protected:
   virtual void ExecuteInternal(const IECommandExecutor& executor,
-                               const LocatorMap& locator_parameters,
                                const ParametersMap& command_parameters,
                                Response* response) {
     ParametersMap::const_iterator script_parameter_iterator = command_parameters.find("script");

cpp/iedriver/CommandHandlers/FindChildElementCommandHandler.h

@@ -31,13 +31,12 @@ class FindChildElementCommandHandler : public IECommandHandler {
 
  protected:
   void ExecuteInternal(const IECommandExecutor& executor,
-                       const LocatorMap& locator_parameters,
                        const ParametersMap& command_parameters,
                        Response* response) {
-    LocatorMap::const_iterator id_parameter_iterator = locator_parameters.find("id");
+    ParametersMap::const_iterator id_parameter_iterator = command_parameters.find("id");
     ParametersMap::const_iterator using_parameter_iterator = command_parameters.find("using");
     ParametersMap::const_iterator value_parameter_iterator = command_parameters.find("value");
-    if (id_parameter_iterator == locator_parameters.end()) {
+    if (id_parameter_iterator == command_parameters.end()) {
       response->SetErrorResponse(400, "Missing parameter in URL: id");
       return;
     } else if (using_parameter_iterator == command_parameters.end()) {
@@ -49,7 +48,7 @@ class FindChildElementCommandHandler : public IECommandHandler {
     } else {
       std::string mechanism = using_parameter_iterator->second.asString();
       std::string value = value_parameter_iterator->second.asString();
-      std::string element_id = id_parameter_iterator->second;
+      std::string element_id = id_parameter_iterator->second.asString();
 
       ElementHandle parent_element_wrapper;
       int status_code = this->GetElement(executor,

cpp/iedriver/CommandHandlers/FindChildElementsCommandHandler.h

@@ -31,13 +31,12 @@ class FindChildElementsCommandHandler : public IECommandHandler {
 
  protected:
   void ExecuteInternal(const IECommandExecutor& executor,
-                       const LocatorMap& locator_parameters,
                        const ParametersMap& command_parameters,
                        Response* response) {
-    LocatorMap::const_iterator id_parameter_iterator = locator_parameters.find("id");
+    ParametersMap::const_iterator id_parameter_iterator = command_parameters.find("id");
     ParametersMap::const_iterator using_parameter_iterator = command_parameters.find("using");
     ParametersMap::const_iterator value_parameter_iterator = command_parameters.find("value");
-    if (id_parameter_iterator == locator_parameters.end()) {
+    if (id_parameter_iterator == command_parameters.end()) {
       response->SetErrorResponse(400, "Missing parameter in URL: id");
       return;
     } else if (using_parameter_iterator == command_parameters.end()) {
@@ -49,7 +48,7 @@ class FindChildElementsCommandHandler : public IECommandHandler {
     } else {
       std::string mechanism = using_parameter_iterator->second.asString();
       std::string value = value_parameter_iterator->second.asString();
-      std::string element_id = id_parameter_iterator->second;
+      std::string element_id = id_parameter_iterator->second.asString();
 
       ElementHandle parent_element_wrapper;
       int status_code = this->GetElement(executor,

cpp/iedriver/CommandHandlers/FindElementCommandHandler.h

@@ -31,7 +31,6 @@ class FindElementCommandHandler : public IECommandHandler {
 
  protected:
   void ExecuteInternal(const IECommandExecutor& executor,
-                       const LocatorMap& locator_parameters,
                        const ParametersMap& command_parameters,
                        Response* response) {
     ParametersMap::const_iterator using_parameter_iterator = command_parameters.find("using");

cpp/iedriver/CommandHandlers/FindElementsCommandHandler.h

@@ -31,7 +31,6 @@ class FindElementsCommandHandler : public IECommandHandler {
 
  protected:
   void ExecuteInternal(const IECommandExecutor& executor,
-                       const LocatorMap& locator_parameters,
                        const ParametersMap& command_parameters,
                        Response* response) {
     ParametersMap::const_iterator using_parameter_iterator = command_parameters.find("using");

cpp/iedriver/CommandHandlers/GetActiveElementCommandHandler.h

@@ -30,7 +30,6 @@ class GetActiveElementCommandHandler : public IECommandHandler {
 
  protected:
   void ExecuteInternal(const IECommandExecutor& executor,
-                       const LocatorMap& locator_parameters,
                        const ParametersMap& command_parameters,
                        Response* response) {
     BrowserHandle browser_wrapper;

cpp/iedriver/CommandHandlers/GetAlertTextCommandHandler.h

@@ -31,7 +31,6 @@ class GetAlertTextCommandHandler : public IECommandHandler {
 
  protected:
   void ExecuteInternal(const IECommandExecutor& executor,
-                       const LocatorMap& locator_parameters,
                        const ParametersMap& command_parameters,
                        Response* response) {
     BrowserHandle browser_wrapper;

cpp/iedriver/CommandHandlers/GetAllCookiesCommandHandler.h

@@ -30,7 +30,6 @@ class GetAllCookiesCommandHandler : public IECommandHandler {
 
  protected:
   void ExecuteInternal(const IECommandExecutor& executor,
-                       const LocatorMap& locator_parameters,
                        const ParametersMap& command_parameters,
                        Response* response) {
     Json::Value response_value(Json::arrayValue);

cpp/iedriver/CommandHandlers/GetAllWindowHandlesCommandHandler.h

@@ -30,7 +30,6 @@ class GetAllWindowHandlesCommandHandler : public IECommandHandler {
 
  protected:
   void ExecuteInternal(const IECommandExecutor& executor,
-                       const LocatorMap& locator_parameters,
                        const ParametersMap& command_parameters,
                        Response* response) {
     Json::Value handles(Json::arrayValue);

cpp/iedriver/CommandHandlers/GetCurrentUrlCommandHandler.h

@@ -31,7 +31,6 @@ class GetCurrentUrlCommandHandler : public IECommandHandler {
 
  protected:
   void ExecuteInternal(const IECommandExecutor& executor,
-                       const LocatorMap& locator_parameters,
                        const ParametersMap& command_parameters,
                        Response* response) {
     BrowserHandle browser_wrapper;

cpp/iedriver/CommandHandlers/GetCurrentWindowHandleCommandHandler.h

@@ -30,7 +30,6 @@ class GetCurrentWindowHandleCommandHandler : public IECommandHandler {
 
  protected:
   void ExecuteInternal(const IECommandExecutor& executor,
-                       const LocatorMap& locator_parameters,
                        const ParametersMap& command_parameters,
                        Response* response) {
     std::string current_handle = executor.current_browser_id();

cpp/iedriver/CommandHandlers/GetElementAttributeCommandHandler.h

@@ -30,20 +30,19 @@ class GetElementAttributeCommandHandler : public IECommandHandler {
 
  protected:
   void ExecuteInternal(const IECommandExecutor& executor,
-                       const LocatorMap& locator_parameters,
                        const ParametersMap& command_parameters,
                        Response* response) {
-    LocatorMap::const_iterator id_parameter_iterator = locator_parameters.find("id");
-    LocatorMap::const_iterator name_parameter_iterator = locator_parameters.find("name");
-    if (id_parameter_iterator == locator_parameters.end()) {
+    ParametersMap::const_iterator id_parameter_iterator = command_parameters.find("id");
+    ParametersMap::const_iterator name_parameter_iterator = command_parameters.find("name");
+    if (id_parameter_iterator == command_parameters.end()) {
       response->SetErrorResponse(400, "Missing parameter in URL: id");
       return;
-    } else if (name_parameter_iterator == locator_parameters.end()) {
+    } else if (name_parameter_iterator == command_parameters.end()) {
       response->SetErrorResponse(400, "Missing parameter in URL: name");
       return;
     } else {
-      std::string element_id = id_parameter_iterator->second;
-      std::string name = name_parameter_iterator->second;
+      std::string element_id = id_parameter_iterator->second.asString();
+      std::string name = name_parameter_iterator->second.asString();
 
       BrowserHandle browser_wrapper;
       int status_code = executor.GetCurrentBrowser(&browser_wrapper);

cpp/iedriver/CommandHandlers/GetElementLocationCommandHandler.h

@@ -30,15 +30,14 @@ class GetElementLocationCommandHandler : public IECommandHandler {
 
  protected:
   void ExecuteInternal(const IECommandExecutor& executor,
-                       const LocatorMap& locator_parameters,
                        const ParametersMap& command_parameters,
                        Response* response) {
-    LocatorMap::const_iterator id_parameter_iterator = locator_parameters.find("id");
-    if (id_parameter_iterator == locator_parameters.end()) {
+    ParametersMap::const_iterator id_parameter_iterator = command_parameters.find("id");
+    if (id_parameter_iterator == command_parameters.end()) {
       response->SetErrorResponse(400, "Missing parameter in URL: id");
       return;
     } else {
-      std::string element_id = id_parameter_iterator->second;
+      std::string element_id = id_parameter_iterator->second.asString();
 
       BrowserHandle browser_wrapper;
       int status_code = executor.GetCurrentBrowser(&browser_wrapper);

cpp/iedriver/CommandHandlers/GetElementLocationOnceScrolledIntoViewCommandHandler.h

@@ -31,15 +31,14 @@ class GetElementLocationOnceScrolledIntoViewCommandHandler : public IECommandHan
 
  protected:
   void ExecuteInternal(const IECommandExecutor& executor,
-                       const LocatorMap& locator_parameters,
                        const ParametersMap& command_parameters,
                        Response* response) {
-    LocatorMap::const_iterator id_parameter_iterator = locator_parameters.find("id");
-    if (id_parameter_iterator == locator_parameters.end()) {
+    ParametersMap::const_iterator id_parameter_iterator = command_parameters.find("id");
+    if (id_parameter_iterator == command_parameters.end()) {
       response->SetErrorResponse(400, "Missing parameter in URL: id");
       return;
     } else {
-      std::string element_id = id_parameter_iterator->second;
+      std::string element_id = id_parameter_iterator->second.asString();
 
       BrowserHandle browser_wrapper;
       int status_code = executor.GetCurrentBrowser(&browser_wrapper);

cpp/iedriver/CommandHandlers/GetElementSizeCommandHandler.h

@@ -31,15 +31,14 @@ class GetElementSizeCommandHandler : public IECommandHandler {
 
  protected:
   void ExecuteInternal(const IECommandExecutor& executor,
-                       const LocatorMap& locator_parameters,
                        const ParametersMap& command_parameters,
                        Response* response) {
-    LocatorMap::const_iterator id_parameter_iterator = locator_parameters.find("id");
-    if (id_parameter_iterator == locator_parameters.end()) {
+    ParametersMap::const_iterator id_parameter_iterator = command_parameters.find("id");
+    if (id_parameter_iterator == command_parameters.end()) {
       response->SetErrorResponse(400, "Missing parameter in URL: id");
       return;
     } else {
-      std::string element_id = id_parameter_iterator->second;
+      std::string element_id = id_parameter_iterator->second.asString();
 
       BrowserHandle browser_wrapper;
       int status_code = executor.GetCurrentBrowser(&browser_wrapper);

cpp/iedriver/CommandHandlers/GetElementTagNameCommandHandler.h

@@ -30,15 +30,14 @@ class GetElementTagNameCommandHandler : public IECommandHandler {
 
  protected:
   void ExecuteInternal(const IECommandExecutor& executor,
-                       const LocatorMap& locator_parameters,
                        const ParametersMap& command_parameters,
                        Response* response) {
-    LocatorMap::const_iterator id_parameter_iterator = locator_parameters.find("id");
-    if (id_parameter_iterator == locator_parameters.end()) {
+    ParametersMap::const_iterator id_parameter_iterator = command_parameters.find("id");
+    if (id_parameter_iterator == command_parameters.end()) {
       response->SetErrorResponse(400, "Missing parameter in URL: id");
       return;
     } else {
-      std::string element_id = id_parameter_iterator->second;
+      std::string element_id = id_parameter_iterator->second.asString();
       ElementHandle element_wrapper;
       int status_code = this->GetElement(executor, element_id, &element_wrapper);
       if (status_code == WD_SUCCESS) {

cpp/iedriver/CommandHandlers/GetElementTextCommandHandler.h

@@ -31,15 +31,14 @@ class GetElementTextCommandHandler : public IECommandHandler {
 
  protected:
   void ExecuteInternal(const IECommandExecutor& executor,
-                       const LocatorMap& locator_parameters,
                        const ParametersMap& command_parameters,
                        Response* response) {
-    LocatorMap::const_iterator id_parameter_iterator = locator_parameters.find("id");
-    if (id_parameter_iterator == locator_parameters.end()) {
+    ParametersMap::const_iterator id_parameter_iterator = command_parameters.find("id");
+    if (id_parameter_iterator == command_parameters.end()) {
       response->SetErrorResponse(400, "Missing parameter in URL: id");
       return;
     } else {
-      std::string element_id = id_parameter_iterator->second;
+      std::string element_id = id_parameter_iterator->second.asString();
 
       BrowserHandle browser_wrapper;
       int status_code = executor.GetCurrentBrowser(&browser_wrapper);