Name calculation should not include nameFrom:author descendants.

content/browser/accessibility/hit_testing_browsertest.cc

 // Copyright 2014 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/logging.h"
 #include "content/browser/accessibility/browser_accessibility.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
@@ skipping 118 matching lines @@
   // (50, 50) -> "Button"
   BrowserAccessibility* hit_node;
   hit_node = HitTestAndWaitForResult(gfx::Point(50, 50));
   ASSERT_TRUE(hit_node != NULL);
   ASSERT_EQ(ui::AX_ROLE_BUTTON, hit_node->GetRole());
   ASSERT_EQ("Button", hit_node->GetStringAttribute(ui::AX_ATTR_NAME));
 
   // (50, 305) -> div in first iframe
   hit_node = HitTestAndWaitForResult(gfx::Point(50, 305));
   ASSERT_TRUE(hit_node != NULL);
-  ASSERT_EQ(ui::AX_ROLE_DIV, hit_node->GetRole());
+  ASSERT_EQ(ui::AX_ROLE_GENERIC_CONTAINER, hit_node->GetRole());
 
   // (50, 350) -> "Ordinary Button"
   hit_node = HitTestAndWaitForResult(gfx::Point(50, 350));
   ASSERT_TRUE(hit_node != NULL);
   ASSERT_EQ(ui::AX_ROLE_BUTTON, hit_node->GetRole());
   ASSERT_EQ("Ordinary Button", hit_node->GetStringAttribute(ui::AX_ATTR_NAME));
 
   // (50, 455) -> "Scrolled Button"
   hit_node = HitTestAndWaitForResult(gfx::Point(50, 455));
   ASSERT_TRUE(hit_node != NULL);
   ASSERT_EQ(ui::AX_ROLE_BUTTON, hit_node->GetRole());
   ASSERT_EQ("Scrolled Button", hit_node->GetStringAttribute(ui::AX_ATTR_NAME));
 
   // (50, 505) -> div in second iframe
   hit_node = HitTestAndWaitForResult(gfx::Point(50, 505));
   ASSERT_TRUE(hit_node != NULL);
-  ASSERT_EQ(ui::AX_ROLE_DIV, hit_node->GetRole());
+  ASSERT_EQ(ui::AX_ROLE_GENERIC_CONTAINER, hit_node->GetRole());
 
   // (50, 505) -> div in second iframe
   // but with a different event
   hit_node =
       HitTestAndWaitForResultWithEvent(gfx::Point(50, 505), ui::AX_EVENT_ALERT);
   ASSERT_NE(hit_node, nullptr);
-  ASSERT_EQ(ui::AX_ROLE_DIV, hit_node->GetRole());
+  ASSERT_EQ(ui::AX_ROLE_GENERIC_CONTAINER, hit_node->GetRole());
 }
 
 IN_PROC_BROWSER_TEST_F(AccessibilityHitTestingBrowserTest,
                        CachingAsyncHitTestingInIframes) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
   NavigateToURL(shell(), GURL(url::kAboutBlankURL));
 
   AccessibilityNotificationWaiter waiter(shell()->web_contents(),
                                          kAccessibilityModeComplete,
@@ skipping 19 matching lines @@
   BrowserAccessibility* hit_node;
   hit_node = CallCachingAsyncHitTest(gfx::Point(50, 50));
   ASSERT_TRUE(hit_node != NULL);
   ASSERT_NE(ui::AX_ROLE_BUTTON, hit_node->GetRole());
   hit_node = CallCachingAsyncHitTest(gfx::Point(50, 50));
   ASSERT_EQ("Button", hit_node->GetStringAttribute(ui::AX_ATTR_NAME));
 
   // (50, 305) -> div in first iframe
   hit_node = CallCachingAsyncHitTest(gfx::Point(50, 305));
   ASSERT_TRUE(hit_node != NULL);
-  ASSERT_NE(ui::AX_ROLE_DIV, hit_node->GetRole());
+  ASSERT_NE(ui::AX_ROLE_GENERIC_CONTAINER, hit_node->GetRole());
   hit_node = CallCachingAsyncHitTest(gfx::Point(50, 305));
-  ASSERT_EQ(ui::AX_ROLE_DIV, hit_node->GetRole());
+  ASSERT_EQ(ui::AX_ROLE_GENERIC_CONTAINER, hit_node->GetRole());
 
   // (50, 350) -> "Ordinary Button"
   hit_node = CallCachingAsyncHitTest(gfx::Point(50, 350));
   ASSERT_TRUE(hit_node != NULL);
   ASSERT_NE(ui::AX_ROLE_BUTTON, hit_node->GetRole());
   hit_node = CallCachingAsyncHitTest(gfx::Point(50, 350));
   ASSERT_EQ(ui::AX_ROLE_BUTTON, hit_node->GetRole());
   ASSERT_EQ("Ordinary Button", hit_node->GetStringAttribute(ui::AX_ATTR_NAME));
 
   // (50, 455) -> "Scrolled Button"
   hit_node = CallCachingAsyncHitTest(gfx::Point(50, 455));
   ASSERT_TRUE(hit_node != NULL);
   ASSERT_NE(ui::AX_ROLE_BUTTON, hit_node->GetRole());
   hit_node = CallCachingAsyncHitTest(gfx::Point(50, 455));
   ASSERT_EQ(ui::AX_ROLE_BUTTON, hit_node->GetRole());
   ASSERT_EQ("Scrolled Button", hit_node->GetStringAttribute(ui::AX_ATTR_NAME));
 
   // (50, 505) -> div in second iframe
   hit_node = CallCachingAsyncHitTest(gfx::Point(50, 505));
   ASSERT_TRUE(hit_node != NULL);
-  ASSERT_NE(ui::AX_ROLE_DIV, hit_node->GetRole());
+  ASSERT_NE(ui::AX_ROLE_GENERIC_CONTAINER, hit_node->GetRole());
   hit_node = CallCachingAsyncHitTest(gfx::Point(50, 505));
-  ASSERT_EQ(ui::AX_ROLE_DIV, hit_node->GetRole());
+  ASSERT_EQ(ui::AX_ROLE_GENERIC_CONTAINER, hit_node->GetRole());
 }
 
 }  // namespace content