Make use of new AX name calc in Chromium.

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

 /*
  * Copyright (C) 2010 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 101 matching lines @@
     ASSERT(parent->isMenuListPopup());
 
     AXObject* grandparent = parent->parentObject();
     if (!grandparent)
         return LayoutRect();
     ASSERT(grandparent->isMenuList());
 
     return grandparent->elementRect();
 }
 
-String AXMenuListOption::stringValue() const
+String AXMenuListOption::textAlternative(bool recursive, bool inAriaLabelledByTraversal, AXObjectSet& visited, AXNameFrom& nameFrom, AXRelatedObjectVector* relatedObjects, NameSources* nameSources) const
 {
-    return m_element ? m_element->displayLabel() : String();
+    if (!m_element)
+        return String();
+
+    const AtomicString& ariaLabel = getAttribute(aria_labelAttr);
+    if (!ariaLabel.isEmpty()) {
+        nameFrom = AXNameFromAttribute;
+        if (nameSources) {
+            nameSources->append(NameSource(true, aria_labelAttr));
+            nameSources->last().type = nameFrom;
+            nameSources->last().text = ariaLabel;
+        }
+        return ariaLabel;
+    }
+
+    nameFrom = AXNameFromContents;
+    if (nameSources) {
+        nameSources->append(NameSource(true));
+        nameSources->last().type = nameFrom;
+        nameSources->last().text = m_element->displayLabel();
+    }
+
+    return m_element->displayLabel();
 }
 
 DEFINE_TRACE(AXMenuListOption)
 {
     visitor->trace(m_element);
     AXMockObject::trace(visitor);
 }
 
 } // namespace blink