bug 474984 - Move name calculation for GridCell element to new namerules infrastructure, r=surkov

accessible/tests/mochitest/namerules.xml

@@ -163,6 +163,48 @@
       </html:select>
     </markup>
 
+    <markup ref="html:table/html:tr/html:td" ruleset="htmlelm">
+      <html:span id="l1" a11yname="test2">test2</html:span>
+      <html:span id="l2" a11yname="test3">test3</html:span>
+      <html:label for="tc" a11yname="test4">test4</html:label>
+      <html:table>
+        <html:tr>
+          <html:td id="tc"
+                   aria-label="test1"
+                   aria-labelledby="l1 l2"
+                   title="test5">
+            <html:p>This is a paragraph</html:p>
+            <html:a href="#">This is a link</html:a>
+            <html:ul>
+              <html:li>This is a list</html:li>
+            </html:ul>
+          </html:td>
+        </html:tr>
+      </html:table>
+    </markup>
+
+    <markup ref="html:table/html:tr/html:td" ruleset="htmlctrl">
+      <html:span id="l1" a11yname="test2">test2</html:span>
+      <html:span id="l2" a11yname="test3">test3</html:span>
+      <html:label for="gc" a11yname="test4">test4</html:label>
+      <html:table>
+        <html:tr>
+          <html:td id="gc"
+                   role="gridcell"
+                   aria-label="test1"
+                   aria-labelledby="l1 l2"
+                   a11yname="  This is a paragraph  This is a link     This is a list"
+                   title="This is a paragraph This is a link This is a list">
+            <html:p>This is a paragraph</html:p>
+            <html:a href="#">This is a link</html:a>
+            <html:ul>
+              <html:li>This is a list</html:li>
+            </html:ul>
+          </html:td>
+        </html:tr>
+      </html:table>
+    </markup>
+
   </rulesample>
 
 </rules>

accessible/tests/mochitest/test_role_table_cells.html

@@ -22,15 +22,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=474281
   <script type="application/javascript">
     function doTests()
     {
-      // XXX For the below tests, remove the name tests once bug 468034 is
-      // fixed, and do the name tests in the new infrastructure.
-
       // Test table cell name and role
-      testName("tc", null);
       testRole("tc", ROLE_CELL);
 
       // Test grid cell.
-      testName("gc", "This is a paragraph This is a link    This is a list");
       testRole("gc", ROLE_GRID_CELL);
 
       SimpleTest.finish();