Name calculation should not include nameFrom:author descendants.

content/browser/accessibility/snapshot_ax_tree_browsertest.cc

 // Copyright 2015 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 "base/callback.h"
 #include "base/macros.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_utils.h"
@@ skipping 68 matching lines @@
 
   // Dump the whole tree if one of the assertions below fails
   // to aid in debugging why it failed.
   SCOPED_TRACE(waiter.snapshot().ToString());
 
   ui::AXTree tree(waiter.snapshot());
   ui::AXNode* root = tree.root();
   ASSERT_NE(nullptr, root);
   ASSERT_EQ(ui::AX_ROLE_ROOT_WEB_AREA, root->data().role);
   ui::AXNode* group = root->ChildAtIndex(0);
-  ASSERT_EQ(ui::AX_ROLE_GROUP, group->data().role);
+  ASSERT_EQ(ui::AX_ROLE_GENERIC_CONTAINER, group->data().role);
   ui::AXNode* button = group->ChildAtIndex(0);
   ASSERT_EQ(ui::AX_ROLE_BUTTON, button->data().role);
 }
 
 IN_PROC_BROWSER_TEST_F(SnapshotAXTreeBrowserTest,
                        SnapshotAccessibilityTreeFromMultipleFrames) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
   NavigateToURL(shell(), embedded_test_server()->GetURL(
       "/accessibility/snapshot/outer.html"));
@@ skipping 15 matching lines @@
   // Dump the whole tree if one of the assertions below fails
   // to aid in debugging why it failed.
   SCOPED_TRACE(waiter.snapshot().ToString());
 
   ui::AXTree tree(waiter.snapshot());
   ui::AXNode* root = tree.root();
   std::string dump;
   DumpRolesAndNamesAsText(root, 0, &dump);
   EXPECT_EQ(
       "rootWebArea\n"
-      "  group\n"
+      "  genericContainer\n"
       "    button 'Before'\n"
       "    iframe\n"
       "      rootWebArea\n"
       "        pre\n"
       "          staticText 'Alpha'\n"
       "    button 'Middle'\n"
       "    iframe\n"
       "      rootWebArea\n"
-      "        group\n"
+      "        genericContainer\n"
       "          button 'Inside Before'\n"
       "          iframe\n"
       "            rootWebArea\n"
       "          button 'Inside After'\n"
       "    button 'After'\n",
       dump);
 }
 
 }  // namespace content