Name calculation should not include nameFrom:author descendants.

content/browser/accessibility/browser_accessibility_win_unittest.cc

 // Copyright (c) 2012 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 "content/browser/accessibility/browser_accessibility_win.h"
 
 #include <objbase.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 722 matching lines @@
   EXPECT_EQ(1 << ui::AX_STATE_BUSY | 1 << ui::AX_STATE_READ_ONLY,
             root->GetState());
 
   int32_t unique_id = ToBrowserAccessibilityWin(root)->unique_id();
   ASSERT_EQ(root, BrowserAccessibility::GetFromUniqueID(unique_id));
 }
 
 TEST_F(BrowserAccessibilityTest, TestIA2Attributes) {
   ui::AXNodeData pseudo_before;
   pseudo_before.id = 2;
-  pseudo_before.role = ui::AX_ROLE_DIV;
+  pseudo_before.role = ui::AX_ROLE_GENERIC_CONTAINER;
   pseudo_before.AddStringAttribute(ui::AX_ATTR_HTML_TAG, "<pseudo:before>");
   pseudo_before.AddStringAttribute(ui::AX_ATTR_DISPLAY, "none");
 
   ui::AXNodeData checkbox;
   checkbox.id = 3;
   checkbox.SetName("Checkbox");
   checkbox.role = ui::AX_ROLE_CHECK_BOX;
   checkbox.AddIntAttribute(ui::AX_ATTR_CHECKED_STATE,
                            ui::AX_CHECKED_STATE_TRUE);
 
@@ skipping 212 matching lines @@
   root.id = 1;
   root.role = ui::AX_ROLE_ROOT_WEB_AREA;
   root.AddState(ui::AX_STATE_READ_ONLY);
   root.AddState(ui::AX_STATE_FOCUSABLE);
 
   ui::AXNodeData textarea, textarea_div, textarea_text;
   textarea.id = 2;
   textarea_div.id = 3;
   textarea_text.id = 4;
   textarea.role = ui::AX_ROLE_TEXT_FIELD;
-  textarea_div.role = ui::AX_ROLE_DIV;
+  textarea_div.role = ui::AX_ROLE_GENERIC_CONTAINER;
   textarea_text.role = ui::AX_ROLE_STATIC_TEXT;
   textarea.AddState(ui::AX_STATE_EDITABLE);
   textarea.AddState(ui::AX_STATE_FOCUSABLE);
   textarea.AddState(ui::AX_STATE_MULTILINE);
   textarea_div.AddState(ui::AX_STATE_EDITABLE);
   textarea_text.AddState(ui::AX_STATE_EDITABLE);
   textarea.SetValue(base::UTF16ToUTF8(text));
   textarea_text.SetName(base::UTF16ToUTF8(text));
   textarea.AddStringAttribute(ui::AX_ATTR_HTML_TAG, "textarea");
   textarea.child_ids.push_back(textarea_div.id);
@@ skipping 13 matching lines @@
   textarea_line2.AddIntListAttribute(ui::AX_ATTR_WORD_STARTS,
                                      line2_word_starts);
   textarea_text.child_ids.push_back(textarea_line1.id);
   textarea_text.child_ids.push_back(textarea_line2.id);
 
   ui::AXNodeData text_field, text_field_div, text_field_text;
   text_field.id = 7;
   text_field_div.id = 8;
   text_field_text.id = 9;
   text_field.role = ui::AX_ROLE_TEXT_FIELD;
-  text_field_div.role = ui::AX_ROLE_DIV;
+  text_field_div.role = ui::AX_ROLE_GENERIC_CONTAINER;
   text_field_text.role = ui::AX_ROLE_STATIC_TEXT;
   text_field.AddState(ui::AX_STATE_EDITABLE);
   text_field.AddState(ui::AX_STATE_FOCUSABLE);
   text_field_div.AddState(ui::AX_STATE_EDITABLE);
   text_field_text.AddState(ui::AX_STATE_EDITABLE);
   text_field.SetValue(base::UTF16ToUTF8(line1));
   text_field_text.SetName(base::UTF16ToUTF8(line1));
   text_field.AddStringAttribute(ui::AX_ATTR_HTML_TAG, "input");
   text_field.html_attributes.push_back(std::make_pair("type", "text"));
   text_field.child_ids.push_back(text_field_div.id);
@@ skipping 179 matching lines @@
 
 TEST_F(BrowserAccessibilityTest, TestCaretInContentEditables) {
   ui::AXNodeData root;
   root.id = 1;
   root.role = ui::AX_ROLE_ROOT_WEB_AREA;
   root.AddState(ui::AX_STATE_READ_ONLY);
   root.AddState(ui::AX_STATE_FOCUSABLE);
 
   ui::AXNodeData div_editable;
   div_editable.id = 2;
-  div_editable.role = ui::AX_ROLE_DIV;
+  div_editable.role = ui::AX_ROLE_GENERIC_CONTAINER;
   div_editable.AddState(ui::AX_STATE_EDITABLE);
   div_editable.AddState(ui::AX_STATE_FOCUSABLE);
 
   ui::AXNodeData text;
   text.id = 3;
   text.role = ui::AX_ROLE_STATIC_TEXT;
   text.AddState(ui::AX_STATE_EDITABLE);
   text.SetName("Click ");
 
   ui::AXNodeData link;
@@ skipping 101 matching lines @@
 
 TEST_F(BrowserAccessibilityTest, TestSelectionInContentEditables) {
   ui::AXNodeData root;
   root.id = 1;
   root.role = ui::AX_ROLE_ROOT_WEB_AREA;
   root.AddState(ui::AX_STATE_READ_ONLY);
   root.AddState(ui::AX_STATE_FOCUSABLE);
 
   ui::AXNodeData div_editable;
   div_editable.id = 2;
-  div_editable.role = ui::AX_ROLE_DIV;
+  div_editable.role = ui::AX_ROLE_GENERIC_CONTAINER;
   div_editable.AddState(ui::AX_STATE_FOCUSABLE);
   div_editable.AddState(ui::AX_STATE_EDITABLE);
 
   ui::AXNodeData text;
   text.id = 3;
   text.role = ui::AX_ROLE_STATIC_TEXT;
   text.AddState(ui::AX_STATE_FOCUSABLE);
   text.AddState(ui::AX_STATE_EDITABLE);
   text.SetName("Click ");
 
@@ skipping 136 matching lines @@
 
 TEST_F(BrowserAccessibilityTest, TestIAccessibleHyperlink) {
   ui::AXNodeData root;
   root.id = 1;
   root.role = ui::AX_ROLE_ROOT_WEB_AREA;
   root.AddState(ui::AX_STATE_READ_ONLY);
   root.AddState(ui::AX_STATE_FOCUSABLE);
 
   ui::AXNodeData div;
   div.id = 2;
-  div.role = ui::AX_ROLE_DIV;
+  div.role = ui::AX_ROLE_GENERIC_CONTAINER;
   div.AddState(ui::AX_STATE_FOCUSABLE);
 
   ui::AXNodeData text;
   text.id = 3;
   text.role = ui::AX_ROLE_STATIC_TEXT;
   text.SetName("Click ");
 
   ui::AXNodeData link;
   link.id = 4;
   link.role = ui::AX_ROLE_LINK;
@@ skipping 141 matching lines @@
 
 TEST_F(BrowserAccessibilityTest, TestTextAttributesInContentEditables) {
   ui::AXNodeData root;
   root.id = 1;
   root.role = ui::AX_ROLE_ROOT_WEB_AREA;
   root.AddState(ui::AX_STATE_READ_ONLY);
   root.AddState(ui::AX_STATE_FOCUSABLE);
 
   ui::AXNodeData div_editable;
   div_editable.id = 2;
-  div_editable.role = ui::AX_ROLE_DIV;
+  div_editable.role = ui::AX_ROLE_GENERIC_CONTAINER;
   div_editable.AddState(ui::AX_STATE_EDITABLE);
   div_editable.AddState(ui::AX_STATE_FOCUSABLE);
   div_editable.AddStringAttribute(ui::AX_ATTR_FONT_FAMILY, "Helvetica");
 
   ui::AXNodeData text_before;
   text_before.id = 3;
   text_before.role = ui::AX_ROLE_STATIC_TEXT;
   text_before.AddState(ui::AX_STATE_EDITABLE);
   text_before.SetName("Before ");
   text_before.AddIntAttribute(
@@ skipping 226 matching lines @@
 
   ui::AXNodeData combo_box;
   combo_box.id = 2;
   combo_box.role = ui::AX_ROLE_COMBO_BOX;
   combo_box.AddState(ui::AX_STATE_EDITABLE);
   combo_box.AddState(ui::AX_STATE_FOCUSABLE);
   combo_box.SetValue(value1 + value2);
 
   ui::AXNodeData combo_box_div;
   combo_box_div.id = 3;
-  combo_box_div.role = ui::AX_ROLE_DIV;
+  combo_box_div.role = ui::AX_ROLE_GENERIC_CONTAINER;
   combo_box_div.AddState(ui::AX_STATE_EDITABLE);
 
   ui::AXNodeData static_text1;
   static_text1.id = 4;
   static_text1.role = ui::AX_ROLE_STATIC_TEXT;
   static_text1.AddState(ui::AX_STATE_EDITABLE);
   static_text1.SetName(value1);
 
   ui::AXNodeData static_text2;
   static_text2.id = 5;
@@ skipping 491 matching lines @@
   std::vector<AXEventNotificationDetails> events = {event};
   manager->OnAccessibilityEvents(events);
 
   EXPECT_HRESULT_SUCCEEDED(ax_child1->GetCOM()->get_nRelations(&n_relations));
   EXPECT_EQ(2, n_relations);
   EXPECT_HRESULT_SUCCEEDED(ax_child2->GetCOM()->get_nRelations(&n_relations));
   EXPECT_EQ(2, n_relations);
 }
 
 }  // namespace content