Name calculation should not include nameFrom:author descendants.

content/browser/accessibility/browser_accessibility_com_win.cc

Index: content/browser/accessibility/browser_accessibility_com_win.cc
diff --git a/content/browser/accessibility/browser_accessibility_com_win.cc b/content/browser/accessibility/browser_accessibility_com_win.cc
index ef242b933711c44f2fb5b205e18713b48bf0523c..a50f68d7471457069fddd6a41c611d53913f4334 100644
--- a/content/browser/accessibility/browser_accessibility_com_win.cc
+++ b/content/browser/accessibility/browser_accessibility_com_win.cc
@@ -5285,11 +5285,6 @@ void BrowserAccessibilityComWin::InitRoleAndState() {
       ia_role = ROLE_SYSTEM_DROPLIST;
       ia2_role = IA2_ROLE_DATE_EDITOR;
       break;
-    case ui::AX_ROLE_DIV:
-      role_name = L"div";
-      ia_role = ROLE_SYSTEM_GROUPING;
-      ia2_role = IA2_ROLE_SECTION;
-      break;
     case ui::AX_ROLE_DEFINITION:
       role_name = html_tag;
       ia2_role = IA2_ROLE_PARAGRAPH;
@@ -5355,6 +5350,11 @@ void BrowserAccessibilityComWin::InitRoleAndState() {
       ia_role = ROLE_SYSTEM_GROUPING;
       ia2_role = IA2_ROLE_FOOTER;
       break;
+    case ui::AX_ROLE_GENERIC_CONTAINER:
+      ia_role = ROLE_SYSTEM_GROUPING;
+      ia2_role = IA2_ROLE_SECTION;
+      role_name = html_tag.empty() ? L"div" : html_tag;
+      break;
     case ui::AX_ROLE_GRID:
       ia_role = ROLE_SYSTEM_TABLE;
       // TODO(aleventhal) this changed between ARIA 1.0 and 1.1,
@@ -5362,23 +5362,9 @@ void BrowserAccessibilityComWin::InitRoleAndState() {
       // or editable by default
       // ia_state |= STATE_SYSTEM_READONLY;
       break;
-    case ui::AX_ROLE_GROUP: {
-      base::string16 aria_role =
-          owner()->GetString16Attribute(ui::AX_ATTR_ROLE);
-      if (aria_role == L"group" || html_tag == L"fieldset") {
-        ia_role = ROLE_SYSTEM_GROUPING;
-      } else if (html_tag == L"li") {
-        ia_role = ROLE_SYSTEM_LISTITEM;
-        ia_state |= STATE_SYSTEM_READONLY;
-      } else {
-        if (html_tag.empty())
-          role_name = L"div";
-        else
-          role_name = html_tag;
-        ia2_role = IA2_ROLE_SECTION;
-      }
+    case ui::AX_ROLE_GROUP:
+      ia_role = ROLE_SYSTEM_GROUPING;
       break;
-    }
     case ui::AX_ROLE_HEADING:
       role_name = html_tag;
       if (html_tag.empty())