Name calculation should not include nameFrom:author descendants.

content/browser/accessibility/hit_testing_browsertest.cc

Index: content/browser/accessibility/hit_testing_browsertest.cc
diff --git a/content/browser/accessibility/hit_testing_browsertest.cc b/content/browser/accessibility/hit_testing_browsertest.cc
index 6e959d687a48b6e6e4dc77aa3de5c49798ea7bf7..ad3cc5134dae5d340f9fc099222a344e2630e364 100644
--- a/content/browser/accessibility/hit_testing_browsertest.cc
+++ b/content/browser/accessibility/hit_testing_browsertest.cc
@@ -136,7 +136,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityHitTestingBrowserTest,
   // (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));
@@ -153,14 +153,14 @@ IN_PROC_BROWSER_TEST_F(AccessibilityHitTestingBrowserTest,
   // (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,
@@ -200,9 +200,9 @@ IN_PROC_BROWSER_TEST_F(AccessibilityHitTestingBrowserTest,
   // (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));
@@ -223,9 +223,9 @@ IN_PROC_BROWSER_TEST_F(AccessibilityHitTestingBrowserTest,
   // (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