[chromedriver] Added option to make element references W3C compliant.

chrome/test/chromedriver/element_util.cc

 // Copyright (c) 2013 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/chromedriver/element_util.h"
 
 #include <utility>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/test/chromedriver/basic_types.h"
 #include "chrome/test/chromedriver/chrome/chrome.h"
 #include "chrome/test/chromedriver/chrome/js.h"
 #include "chrome/test/chromedriver/chrome/status.h"
 #include "chrome/test/chromedriver/chrome/web_view.h"
 #include "chrome/test/chromedriver/session.h"
 #include "third_party/webdriver/atoms.h"
 
 namespace {
 
 const char kElementKey[] = "ELEMENT";
+const char kElementKeyW3C[] = "element-6066-11e4-a52e-4f735466cecf";
+
+std::string GetElementKey() {
+  Session* session = GetThreadLocalSession();

[samuong, 2016/08/11 18:13:20]

put a CHECK(session) here, just in case

[roisinmcl, 2016/08/13 01:47:26]

Done.

+  if (session->w3c_compliant)
+    return kElementKeyW3C;
+  else
+    return kElementKey;
+}
 
 bool ParseFromValue(base::Value* value, WebPoint* point) {
   base::DictionaryValue* dict_value;
   if (!value->GetAsDictionary(&dict_value))
     return false;
   double x = 0;
   double y = 0;
   if (!dict_value->GetDouble("x", &x) ||
       !dict_value->GetDouble("y", &y))
     return false;
@@ skipping 166 matching lines @@
     return Status(kUnknownError, "failed to get border width of element");
   *border_left = border_left_tmp;
   *border_top = border_top_tmp;
   return Status(kOk);
 }
 
 }  // namespace
 
 base::DictionaryValue* CreateElement(const std::string& element_id) {
   base::DictionaryValue* element = new base::DictionaryValue();
-  element->SetString(kElementKey, element_id);
+  element->SetString(GetElementKey(), element_id);
   return element;
 }
 
 base::Value* CreateValueFrom(const WebPoint& point) {
   base::DictionaryValue* dict = new base::DictionaryValue();
   dict->SetInteger("x", point.x);
   dict->SetInteger("y", point.y);
   return dict;
 }
 
@@ skipping 32 matching lines @@
       return status;
 
     if (!temp->IsType(base::Value::TYPE_NULL)) {
       if (only_one) {
         value->reset(temp.release());
         return Status(kOk);
       } else {
         base::ListValue* result;
         if (!temp->GetAsList(&result))
           return Status(kUnknownError, "script returns unexpected result");
-
         if (result->GetSize() > 0U) {
           value->reset(temp.release());
           return Status(kOk);
         }
       }
     }
 
     if (base::TimeTicks::Now() - start_time >= session->implicit_wait) {
       if (only_one) {
         return Status(kNoSuchElement, "Unable to locate element: {\"method\":\""
@@ skipping 99 matching lines @@
         "}";
     base::ListValue args;
     args.Append(CreateElement(element_id));
     std::unique_ptr<base::Value> result;
     status = web_view->CallFunction(
         session->GetCurrentFrameId(), kGetImageElementForArea, args, &result);
     if (status.IsError())
       return status;
     const base::DictionaryValue* element_dict;
     if (!result->GetAsDictionary(&element_dict) ||
-        !element_dict->GetString(kElementKey, &target_element_id))
+        !element_dict->GetString(GetElementKey(), &target_element_id))
       return Status(kUnknownError, "no element reference returned by script");
   }
   bool is_displayed = false;
   status = IsElementDisplayed(
       session, web_view, target_element_id, true, &is_displayed);
   if (status.IsError())
     return status;
   if (!is_displayed)
     return Status(kElementNotVisible);
 
@@ skipping 227 matching lines @@
                            rit->chromedriver_frame_id.c_str()));
     std::unique_ptr<base::Value> result;
     status = web_view->CallFunction(
         rit->parent_frame_id, kFindSubFrameScript, args, &result);
     if (status.IsError())
       return status;
     const base::DictionaryValue* element_dict;
     if (!result->GetAsDictionary(&element_dict))
       return Status(kUnknownError, "no element reference returned by script");
     std::string frame_element_id;
-    if (!element_dict->GetString(kElementKey, &frame_element_id))
+    if (!element_dict->GetString(GetElementKey(), &frame_element_id))
       return Status(kUnknownError, "failed to locate a sub frame");
 
     // Modify |region_offset| by the frame's border.
     int border_left = -1;
     int border_top = -1;
     status = GetElementBorder(
         rit->parent_frame_id, web_view, frame_element_id,
         &border_left, &border_top);
     if (status.IsError())
       return status;
     region_offset.Offset(border_left, border_top);
 
     status = ScrollElementRegionIntoViewHelper(
         rit->parent_frame_id, web_view, frame_element_id,
         WebRect(region_offset, region_size),
         center, frame_element_id, &region_offset);
     if (status.IsError())
       return status;
   }
   *location = region_offset;
   return Status(kOk);
 }