Make use of new AX name calc in Chromium.

third_party/WebKit/Source/modules/accessibility/AXListBoxOption.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 120 matching lines @@
     if (toHTMLOptionElement(node())->isDisabledFormControl())
         return false;
 
     HTMLSelectElement* selectElement = listBoxOptionParentNode();
     if (selectElement && selectElement->isDisabledFormControl())
         return false;
 
     return true;
 }
 
-String AXListBoxOption::stringValue() const
+String AXListBoxOption::textAlternative(bool recursive, bool inAriaLabelledByTraversal, AXObjectSet& visited, AXNameFrom& nameFrom, AXRelatedObjectVector* relatedObjects, NameSources* nameSources) const
 {
+    // If nameSources is non-null, relatedObjects is used in filling it in, so it must be non-null as well.
+    if (nameSources)
+        ASSERT(relatedObjects);
+
     if (!node())
         return String();
 
-    const AtomicString& ariaLabel = getAttribute(aria_labelAttr);
-    if (!ariaLabel.isNull())
-        return ariaLabel;
+    bool foundTextAlternative = false;
+    String textAlternative = ariaTextAlternative(recursive, inAriaLabelledByTraversal, visited, nameFrom, relatedObjects, nameSources, &foundTextAlternative);
+    if (foundTextAlternative && !nameSources)
+        return textAlternative;
 
-    if (isHTMLOptionElement(node()))
-        return toHTMLOptionElement(node())->displayLabel();
+    nameFrom = AXNameFromContents;
+    textAlternative = toHTMLOptionElement(node())->displayLabel();
+    if (nameSources) {
+        nameSources->append(NameSource(foundTextAlternative));
+        nameSources->last().type = nameFrom;
+        nameSources->last().text = textAlternative;
+        foundTextAlternative = true;
+    }
 
-    return String();
+    return textAlternative;
 }
 
 void AXListBoxOption::setSelected(bool selected)
 {
     HTMLSelectElement* selectElement = listBoxOptionParentNode();
     if (!selectElement)
         return;
 
     if (!canSetSelectedAttribute())
         return;
@@ skipping 28 matching lines @@
     unsigned length = listItems.size();
     for (unsigned i = 0; i < length; i++) {
         if (listItems[i] == node())
             return i;
     }
 
     return -1;
 }
 
 } // namespace blink