Make use of new AX name calc in Chromium.

components/test_runner/web_ax_object_proxy.cc

 // Copyright 2014 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 "components/test_runner/web_ax_object_proxy.h"
 
 #include "base/strings/stringprintf.h"
 #include "gin/handle.h"
 #include "third_party/WebKit/public/platform/WebPoint.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
@@ skipping 281 matching lines @@
   std::string value_description = object.valueDescription().utf8();
   return value_description.insert(0, "AXValueDescription: ");
 }
 
 std::string GetLanguage(const blink::WebAXObject& object) {
   std::string language = object.language().utf8();
   return language.insert(0, "AXLanguage: ");
 }
 
 std::string GetAttributes(const blink::WebAXObject& object) {
-  blink::WebAXNameFrom nameFrom;
-  blink::WebVector<blink::WebAXObject> nameObjects;
-  std::string attributes(object.name(nameFrom, nameObjects).utf8());
+  std::string attributes(object.name().utf8());
   attributes.append("\n");
   attributes.append(GetRole(object));
   return attributes;
 }
 
 blink::WebRect BoundsForCharacter(const blink::WebAXObject& object,
                                   int characterIndex) {
   DCHECK_EQ(object.role(), blink::WebAXRoleStaticText);
   int end = 0;
   for (unsigned i = 0; i < object.childCount(); i++) {
     blink::WebAXObject inline_text_box = object.childAt(i);
     DCHECK_EQ(inline_text_box.role(), blink::WebAXRoleInlineTextBox);
     int start = end;
-    end += inline_text_box.stringValue().length();
+    blink::WebString name = inline_text_box.name();
+    end += name.length();
     if (characterIndex < start || characterIndex >= end)
       continue;
     blink::WebRect inline_text_box_rect = inline_text_box.boundingBoxRect();
     int localIndex = characterIndex - start;
     blink::WebVector<int> character_offsets;
     inline_text_box.characterOffsets(character_offsets);
     DCHECK(character_offsets.size() > 0 &&
-           character_offsets.size() == inline_text_box.stringValue().length());
+           character_offsets.size() == name.length());
     switch (inline_text_box.textDirection()) {
       case blink::WebAXTextDirectionLR: {
         if (localIndex) {
           int left = inline_text_box_rect.x + character_offsets[localIndex - 1];
           int width = character_offsets[localIndex] -
               character_offsets[localIndex - 1];
           return blink::WebRect(left, inline_text_box_rect.y,
                                 width, inline_text_box_rect.height);
         }
         return blink::WebRect(
@@ skipping 49 matching lines @@
 
 void GetBoundariesForOneWord(const blink::WebAXObject& object,
                              int character_index,
                              int& word_start,
                              int& word_end) {
   int end = 0;
   for (unsigned i = 0; i < object.childCount(); i++) {
     blink::WebAXObject inline_text_box = object.childAt(i);
     DCHECK_EQ(inline_text_box.role(), blink::WebAXRoleInlineTextBox);
     int start = end;
-    end += inline_text_box.stringValue().length();
+    blink::WebString name = inline_text_box.name();
+    end += name.length();
     if (end <= character_index)
       continue;
     int localIndex = character_index - start;
 
     blink::WebVector<int> starts;
     blink::WebVector<int> ends;
     inline_text_box.wordBoundaries(starts, ends);
     size_t word_count = starts.size();
     DCHECK_EQ(ends.size(), word_count);
 
@@ skipping 885 matching lines @@
   accessibility_object_.updateLayoutAndCheckValidity();
   blink::WebAXObject obj = accessibility_object_.previousOnLine();
   if (obj.isNull())
     return v8::Local<v8::Object>();
 
   return factory_->GetOrCreate(obj);
 }
 
 std::string WebAXObjectProxy::Name() {
   accessibility_object_.updateLayoutAndCheckValidity();
-  blink::WebAXNameFrom nameFrom;
-  blink::WebVector<blink::WebAXObject> nameObjects;
-  return accessibility_object_.name(nameFrom, nameObjects).utf8();
+  return accessibility_object_.name().utf8();
 }
 
 std::string WebAXObjectProxy::NameFrom() {
   accessibility_object_.updateLayoutAndCheckValidity();
   blink::WebAXNameFrom nameFrom = blink::WebAXNameFromUninitialized;
   blink::WebVector<blink::WebAXObject> nameObjects;
   accessibility_object_.name(nameFrom, nameObjects);
   switch(nameFrom) {
     case blink::WebAXNameFromUninitialized:
       return "";
@@ skipping 160 matching lines @@
   v8::Local<v8::Value> value_handle = gin::CreateHandle(
       isolate, new WebAXObjectProxy(object, this)).ToV8();
   if (value_handle.IsEmpty())
     return v8::Local<v8::Object>();
   v8::Local<v8::Object> handle = value_handle->ToObject(isolate);
   elements_.Append(handle);
   return handle;
 }
 
 }  // namespace test_runner