Re-land: Layout table roles should provide name from contents when used recursively.

Originally landed: crrev.com/c/1117628
Reverted: crrev.com/c/1118945

The test output just needed to be rebaselined because another change
that landed at around the same time eliminated some of the extra
table nodes from the AX tree.

TBR=aleventhal@chromium.org

Bug: 856277
Change-Id: I6c22a0ff4af5322378207253fc260365f0efcbe4
Reviewed-on: https://chromium-review.googlesource.com/1120636Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Commit-Queue: Dominic Mazzoni <dmazzoni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#571568}

content/browser/accessibility/dump_accessibility_tree_browsertest.cc

@@ -1509,6 +1509,11 @@ IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityLandmark) {
   RunHtmlTest(FILE_PATH_LITERAL("landmark.html"));
 }
 
+IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
+                       AccessibilityLayoutTableInButton) {
+  RunHtmlTest(FILE_PATH_LITERAL("layout-table-in-button.html"));
+}
+
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityLegend) {
   RunHtmlTest(FILE_PATH_LITERAL("legend.html"));
 }

content/test/data/accessibility/html/layout-table-in-button-expected-blink.txt

+rootWebArea
+++button name='Conversation with Foo. 0 unread messages.'
+++++layoutTable
+++++++layoutTableRow
+++++++++layoutTableCell name='Conversation with Foo. 0 unread messages.'
+++++++++++genericContainer name='Conversation with Foo. 0 unread messages.'
+++++++++++++staticText name='Foo'
+++++++++++++++inlineTextBox name='Foo'

content/test/data/accessibility/html/layout-table-in-button.html

+<div tabindex=-1 role=button>
+  <div style="display: table">
+    <div style="display: table-row">
+      <div style="display: table-cell">
+        <div aria-label="Conversation with Foo. 0 unread messages.">
+          <span>Foo</span>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

third_party/blink/renderer/modules/accessibility/ax_object.cc

@@ -3165,9 +3165,6 @@ bool AXObject::NameFromContents(bool recursive) const {
     case kIframeRole:
     case kImageRole:
     case kInputTimeRole:
-    case kLayoutTableRole:
-    case kLayoutTableColumnRole:
-    case kLayoutTableRowRole:
     case kListBoxRole:
     case kLogRole:
     case kMainRole:
@@ -3227,6 +3224,9 @@ bool AXObject::NameFromContents(bool recursive) const {
     case kImageMapRole:
     case kInlineTextBoxRole:
     case kLabelRole:
+    case kLayoutTableRole:
+    case kLayoutTableColumnRole:
+    case kLayoutTableRowRole:
     case kLegendRole:
     case kListRole:
     case kListItemRole: