Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(543)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/accessibility/cross_platform_accessibility_browsertest.cc

Issue 10544099: Refactor all accessibility code out of webkit/glue. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More Mac compile errors Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/accessibility/browser_accessibility_win_unittest.cc ('k') | content/browser/accessibility/renderer_accessibility_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/accessibility/cross_platform_accessibility_browsertest.cc
diff --git a/content/browser/accessibility/cross_platform_accessibility_browsertest.cc b/content/browser/accessibility/cross_platform_accessibility_browsertest.cc
index 8cd61e9725a76b59f131122bc722b2c64f605255..12380cb7c905d04d592455bb734b6944e1c3c218 100644
--- a/content/browser/accessibility/cross_platform_accessibility_browsertest.cc
+++ b/content/browser/accessibility/cross_platform_accessibility_browsertest.cc
@@ -21,11 +21,11 @@
#include "ui/base/win/atl_module.h"
#endif
+using content::AccessibilityNodeData;
using content::OpenURLParams;
using content::RenderViewHostImpl;
using content::RenderWidgetHostImpl;
using content::Referrer;
-using webkit_glue::WebAccessibility;
namespace {
@@ -35,7 +35,7 @@ class CrossPlatformAccessibilityBrowserTest : public InProcessBrowserTest {
// Tell the renderer to send an accessibility tree, then wait for the
// notification that it's been received.
- const WebAccessibility& GetWebAccessibilityTree(
+ const AccessibilityNodeData& GetAccessibilityNodeDataTree(
AccessibilityMode accessibility_mode = AccessibilityModeComplete) {
ui_test_utils::WindowedNotificationObserver tree_updated_observer(
content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED,
@@ -53,7 +53,7 @@ class CrossPlatformAccessibilityBrowserTest : public InProcessBrowserTest {
// Make sure each node in the tree has an unique id.
void RecursiveAssertUniqueIds(
- const WebAccessibility& node, base::hash_set<int>* ids) {
+ const AccessibilityNodeData& node, base::hash_set<int>* ids) {
ASSERT_TRUE(ids->find(node.id) == ids->end());
ids->insert(node.id);
for (size_t i = 0; i < node.children.size(); i++)
@@ -65,12 +65,12 @@ class CrossPlatformAccessibilityBrowserTest : public InProcessBrowserTest {
void TearDownInProcessBrowserTestFixture();
protected:
- std::string GetAttr(const WebAccessibility& node,
- const WebAccessibility::StringAttribute attr);
- int GetIntAttr(const WebAccessibility& node,
- const WebAccessibility::IntAttribute attr);
- bool GetBoolAttr(const WebAccessibility& node,
- const WebAccessibility::BoolAttribute attr);
+ std::string GetAttr(const AccessibilityNodeData& node,
+ const AccessibilityNodeData::StringAttribute attr);
+ int GetIntAttr(const AccessibilityNodeData& node,
+ const AccessibilityNodeData::IntAttribute attr);
+ bool GetBoolAttr(const AccessibilityNodeData& node,
+ const AccessibilityNodeData::BoolAttribute attr);
};
void CrossPlatformAccessibilityBrowserTest::SetUpInProcessBrowserTestFixture() {
@@ -87,25 +87,25 @@ CrossPlatformAccessibilityBrowserTest::TearDownInProcessBrowserTestFixture() {
#endif
}
-// Convenience method to get the value of a particular WebAccessibility
+// Convenience method to get the value of a particular AccessibilityNodeData
// node attribute as a UTF-8 const char*.
std::string CrossPlatformAccessibilityBrowserTest::GetAttr(
- const WebAccessibility& node,
- const WebAccessibility::StringAttribute attr) {
- std::map<WebAccessibility::StringAttribute, string16>::const_iterator iter =
- node.string_attributes.find(attr);
+ const AccessibilityNodeData& node,
+ const AccessibilityNodeData::StringAttribute attr) {
+ std::map<AccessibilityNodeData::StringAttribute, string16>::const_iterator
+ iter = node.string_attributes.find(attr);
if (iter != node.string_attributes.end())
return UTF16ToUTF8(iter->second);
else
return "";
}
-// Convenience method to get the value of a particular WebAccessibility
+// Convenience method to get the value of a particular AccessibilityNodeData
// node integer attribute.
int CrossPlatformAccessibilityBrowserTest::GetIntAttr(
- const WebAccessibility& node,
- const WebAccessibility::IntAttribute attr) {
- std::map<WebAccessibility::IntAttribute, int32>::const_iterator iter =
+ const AccessibilityNodeData& node,
+ const AccessibilityNodeData::IntAttribute attr) {
+ std::map<AccessibilityNodeData::IntAttribute, int32>::const_iterator iter =
node.int_attributes.find(attr);
if (iter != node.int_attributes.end())
return iter->second;
@@ -113,12 +113,12 @@ int CrossPlatformAccessibilityBrowserTest::GetIntAttr(
return -1;
}
-// Convenience method to get the value of a particular WebAccessibility
+// Convenience method to get the value of a particular AccessibilityNodeData
// node boolean attribute.
bool CrossPlatformAccessibilityBrowserTest::GetBoolAttr(
- const WebAccessibility& node,
- const WebAccessibility::BoolAttribute attr) {
- std::map<WebAccessibility::BoolAttribute, bool>::const_iterator iter =
+ const AccessibilityNodeData& node,
+ const AccessibilityNodeData::BoolAttribute attr) {
+ std::map<AccessibilityNodeData::BoolAttribute, bool>::const_iterator iter =
node.bool_attributes.find(attr);
if (iter != node.bool_attributes.end())
return iter->second;
@@ -139,50 +139,55 @@ IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest,
GURL url(url_str);
browser()->OpenURL(OpenURLParams(
url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false));
- const WebAccessibility& tree = GetWebAccessibilityTree();
+ const AccessibilityNodeData& tree = GetAccessibilityNodeDataTree();
// Check properties of the root element of the tree.
- EXPECT_STREQ(url_str, GetAttr(tree, WebAccessibility::ATTR_DOC_URL).c_str());
+ EXPECT_STREQ(url_str,
+ GetAttr(tree, AccessibilityNodeData::ATTR_DOC_URL).c_str());
EXPECT_STREQ(
"Accessibility Test",
- GetAttr(tree, WebAccessibility::ATTR_DOC_TITLE).c_str());
+ GetAttr(tree, AccessibilityNodeData::ATTR_DOC_TITLE).c_str());
EXPECT_STREQ(
- "html", GetAttr(tree, WebAccessibility::ATTR_DOC_DOCTYPE).c_str());
+ "html", GetAttr(tree, AccessibilityNodeData::ATTR_DOC_DOCTYPE).c_str());
EXPECT_STREQ(
- "text/html", GetAttr(tree, WebAccessibility::ATTR_DOC_MIMETYPE).c_str());
+ "text/html",
+ GetAttr(tree, AccessibilityNodeData::ATTR_DOC_MIMETYPE).c_str());
EXPECT_STREQ("Accessibility Test", UTF16ToUTF8(tree.name).c_str());
- EXPECT_EQ(WebAccessibility::ROLE_ROOT_WEB_AREA, tree.role);
+ EXPECT_EQ(AccessibilityNodeData::ROLE_ROOT_WEB_AREA, tree.role);
// Check properites of the BODY element.
ASSERT_EQ(1U, tree.children.size());
- const WebAccessibility& body = tree.children[0];
- EXPECT_EQ(WebAccessibility::ROLE_GROUP, body.role);
- EXPECT_STREQ("body", GetAttr(body, WebAccessibility::ATTR_HTML_TAG).c_str());
- EXPECT_STREQ("block", GetAttr(body, WebAccessibility::ATTR_DISPLAY).c_str());
+ const AccessibilityNodeData& body = tree.children[0];
+ EXPECT_EQ(AccessibilityNodeData::ROLE_GROUP, body.role);
+ EXPECT_STREQ("body",
+ GetAttr(body, AccessibilityNodeData::ATTR_HTML_TAG).c_str());
+ EXPECT_STREQ("block",
+ GetAttr(body, AccessibilityNodeData::ATTR_DISPLAY).c_str());
// Check properties of the two children of the BODY element.
ASSERT_EQ(2U, body.children.size());
- const WebAccessibility& button = body.children[0];
- EXPECT_EQ(WebAccessibility::ROLE_BUTTON, button.role);
+ const AccessibilityNodeData& button = body.children[0];
+ EXPECT_EQ(AccessibilityNodeData::ROLE_BUTTON, button.role);
EXPECT_STREQ(
- "input", GetAttr(button, WebAccessibility::ATTR_HTML_TAG).c_str());
+ "input", GetAttr(button, AccessibilityNodeData::ATTR_HTML_TAG).c_str());
EXPECT_STREQ("push", UTF16ToUTF8(button.name).c_str());
EXPECT_STREQ(
- "inline-block", GetAttr(button, WebAccessibility::ATTR_DISPLAY).c_str());
+ "inline-block",
+ GetAttr(button, AccessibilityNodeData::ATTR_DISPLAY).c_str());
ASSERT_EQ(2U, button.html_attributes.size());
EXPECT_STREQ("type", UTF16ToUTF8(button.html_attributes[0].first).c_str());
EXPECT_STREQ("button", UTF16ToUTF8(button.html_attributes[0].second).c_str());
EXPECT_STREQ("value", UTF16ToUTF8(button.html_attributes[1].first).c_str());
EXPECT_STREQ("push", UTF16ToUTF8(button.html_attributes[1].second).c_str());
- const WebAccessibility& checkbox = body.children[1];
- EXPECT_EQ(WebAccessibility::ROLE_CHECKBOX, checkbox.role);
+ const AccessibilityNodeData& checkbox = body.children[1];
+ EXPECT_EQ(AccessibilityNodeData::ROLE_CHECKBOX, checkbox.role);
EXPECT_STREQ(
- "input", GetAttr(checkbox, WebAccessibility::ATTR_HTML_TAG).c_str());
+ "input", GetAttr(checkbox, AccessibilityNodeData::ATTR_HTML_TAG).c_str());
EXPECT_STREQ(
"inline-block",
- GetAttr(checkbox, WebAccessibility::ATTR_DISPLAY).c_str());
+ GetAttr(checkbox, AccessibilityNodeData::ATTR_DISPLAY).c_str());
ASSERT_EQ(1U, checkbox.html_attributes.size());
EXPECT_STREQ(
"type", UTF16ToUTF8(checkbox.html_attributes[0].first).c_str());
@@ -203,16 +208,16 @@ IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest,
browser()->OpenURL(OpenURLParams(
url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false));
- const WebAccessibility& tree = GetWebAccessibilityTree();
+ const AccessibilityNodeData& tree = GetAccessibilityNodeDataTree();
ASSERT_EQ(1U, tree.children.size());
- const WebAccessibility& body = tree.children[0];
+ const AccessibilityNodeData& body = tree.children[0];
ASSERT_EQ(1U, body.children.size());
- const WebAccessibility& text = body.children[0];
- EXPECT_EQ(WebAccessibility::ROLE_TEXT_FIELD, text.role);
+ const AccessibilityNodeData& text = body.children[0];
+ EXPECT_EQ(AccessibilityNodeData::ROLE_TEXT_FIELD, text.role);
EXPECT_STREQ(
- "input", GetAttr(text, WebAccessibility::ATTR_HTML_TAG).c_str());
- EXPECT_EQ(0, GetIntAttr(text, WebAccessibility::ATTR_TEXT_SEL_START));
- EXPECT_EQ(0, GetIntAttr(text, WebAccessibility::ATTR_TEXT_SEL_END));
+ "input", GetAttr(text, AccessibilityNodeData::ATTR_HTML_TAG).c_str());
+ EXPECT_EQ(0, GetIntAttr(text, AccessibilityNodeData::ATTR_TEXT_SEL_START));
+ EXPECT_EQ(0, GetIntAttr(text, AccessibilityNodeData::ATTR_TEXT_SEL_END));
EXPECT_STREQ("Hello, world.", UTF16ToUTF8(text.value).c_str());
// TODO(dmazzoni): as soon as more accessibility code is cross-platform,
@@ -233,16 +238,16 @@ IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest,
browser()->OpenURL(OpenURLParams(
url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false));
- const WebAccessibility& tree = GetWebAccessibilityTree();
+ const AccessibilityNodeData& tree = GetAccessibilityNodeDataTree();
ASSERT_EQ(1U, tree.children.size());
- const WebAccessibility& body = tree.children[0];
+ const AccessibilityNodeData& body = tree.children[0];
ASSERT_EQ(1U, body.children.size());
- const WebAccessibility& text = body.children[0];
- EXPECT_EQ(WebAccessibility::ROLE_TEXT_FIELD, text.role);
+ const AccessibilityNodeData& text = body.children[0];
+ EXPECT_EQ(AccessibilityNodeData::ROLE_TEXT_FIELD, text.role);
EXPECT_STREQ(
- "input", GetAttr(text, WebAccessibility::ATTR_HTML_TAG).c_str());
- EXPECT_EQ(0, GetIntAttr(text, WebAccessibility::ATTR_TEXT_SEL_START));
- EXPECT_EQ(13, GetIntAttr(text, WebAccessibility::ATTR_TEXT_SEL_END));
+ "input", GetAttr(text, AccessibilityNodeData::ATTR_HTML_TAG).c_str());
+ EXPECT_EQ(0, GetIntAttr(text, AccessibilityNodeData::ATTR_TEXT_SEL_START));
+ EXPECT_EQ(13, GetIntAttr(text, AccessibilityNodeData::ATTR_TEXT_SEL_END));
EXPECT_STREQ("Hello, world.", UTF16ToUTF8(text.value).c_str());
}
@@ -250,7 +255,7 @@ IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest,
MultipleInheritanceAccessibility) {
// In a WebKit accessibility render tree for a table, each cell is a
// child of both a row and a column, so it appears to use multiple
- // inheritance. Make sure that the WebAccessibilityObject tree only
+ // inheritance. Make sure that the AccessibilityNodeDataObject tree only
// keeps one copy of each cell, and uses an indirect child id for the
// additional reference to it.
const char url_str[] =
@@ -261,23 +266,23 @@ IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest,
browser()->OpenURL(OpenURLParams(
url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false));
- const WebAccessibility& tree = GetWebAccessibilityTree();
+ const AccessibilityNodeData& tree = GetAccessibilityNodeDataTree();
ASSERT_EQ(1U, tree.children.size());
- const WebAccessibility& table = tree.children[0];
- EXPECT_EQ(WebAccessibility::ROLE_TABLE, table.role);
- const WebAccessibility& row = table.children[0];
- EXPECT_EQ(WebAccessibility::ROLE_ROW, row.role);
- const WebAccessibility& cell1 = row.children[0];
- EXPECT_EQ(WebAccessibility::ROLE_CELL, cell1.role);
- const WebAccessibility& cell2 = row.children[1];
- EXPECT_EQ(WebAccessibility::ROLE_CELL, cell2.role);
- const WebAccessibility& column1 = table.children[1];
- EXPECT_EQ(WebAccessibility::ROLE_COLUMN, column1.role);
+ const AccessibilityNodeData& table = tree.children[0];
+ EXPECT_EQ(AccessibilityNodeData::ROLE_TABLE, table.role);
+ const AccessibilityNodeData& row = table.children[0];
+ EXPECT_EQ(AccessibilityNodeData::ROLE_ROW, row.role);
+ const AccessibilityNodeData& cell1 = row.children[0];
+ EXPECT_EQ(AccessibilityNodeData::ROLE_CELL, cell1.role);
+ const AccessibilityNodeData& cell2 = row.children[1];
+ EXPECT_EQ(AccessibilityNodeData::ROLE_CELL, cell2.role);
+ const AccessibilityNodeData& column1 = table.children[1];
+ EXPECT_EQ(AccessibilityNodeData::ROLE_COLUMN, column1.role);
EXPECT_EQ(0U, column1.children.size());
EXPECT_EQ(1U, column1.indirect_child_ids.size());
EXPECT_EQ(cell1.id, column1.indirect_child_ids[0]);
- const WebAccessibility& column2 = table.children[2];
- EXPECT_EQ(WebAccessibility::ROLE_COLUMN, column2.role);
+ const AccessibilityNodeData& column2 = table.children[2];
+ EXPECT_EQ(AccessibilityNodeData::ROLE_COLUMN, column2.role);
EXPECT_EQ(0U, column2.children.size());
EXPECT_EQ(1U, column2.indirect_child_ids.size());
EXPECT_EQ(cell2.id, column2.indirect_child_ids[0]);
@@ -301,7 +306,7 @@ IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest,
browser()->OpenURL(OpenURLParams(
url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false));
- const WebAccessibility& tree = GetWebAccessibilityTree();
+ const AccessibilityNodeData& tree = GetAccessibilityNodeDataTree();
base::hash_set<int> ids;
RecursiveAssertUniqueIds(tree, &ids);
}
@@ -322,37 +327,37 @@ IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest,
browser()->OpenURL(OpenURLParams(
url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false));
- const WebAccessibility& tree = GetWebAccessibilityTree();
+ const AccessibilityNodeData& tree = GetAccessibilityNodeDataTree();
ASSERT_EQ(1U, tree.children.size());
- const WebAccessibility& body = tree.children[0];
+ const AccessibilityNodeData& body = tree.children[0];
ASSERT_EQ(3U, body.children.size());
- const WebAccessibility& button1 = body.children[0];
- EXPECT_EQ(WebAccessibility::ROLE_BUTTON, button1.role);
+ const AccessibilityNodeData& button1 = body.children[0];
+ EXPECT_EQ(AccessibilityNodeData::ROLE_BUTTON, button1.role);
EXPECT_STREQ("Button 1", UTF16ToUTF8(button1.name).c_str());
- const WebAccessibility& iframe = body.children[1];
+ const AccessibilityNodeData& iframe = body.children[1];
EXPECT_STREQ("iframe",
- GetAttr(iframe, WebAccessibility::ATTR_HTML_TAG).c_str());
+ GetAttr(iframe, AccessibilityNodeData::ATTR_HTML_TAG).c_str());
ASSERT_EQ(1U, iframe.children.size());
- const WebAccessibility& scroll_area = iframe.children[0];
- EXPECT_EQ(WebAccessibility::ROLE_SCROLLAREA, scroll_area.role);
+ const AccessibilityNodeData& scroll_area = iframe.children[0];
+ EXPECT_EQ(AccessibilityNodeData::ROLE_SCROLLAREA, scroll_area.role);
ASSERT_EQ(1U, scroll_area.children.size());
- const WebAccessibility& sub_document = scroll_area.children[0];
- EXPECT_EQ(WebAccessibility::ROLE_WEB_AREA, sub_document.role);
+ const AccessibilityNodeData& sub_document = scroll_area.children[0];
+ EXPECT_EQ(AccessibilityNodeData::ROLE_WEB_AREA, sub_document.role);
ASSERT_EQ(1U, sub_document.children.size());
- const WebAccessibility& sub_body = sub_document.children[0];
+ const AccessibilityNodeData& sub_body = sub_document.children[0];
ASSERT_EQ(1U, sub_body.children.size());
- const WebAccessibility& button2 = sub_body.children[0];
- EXPECT_EQ(WebAccessibility::ROLE_BUTTON, button2.role);
+ const AccessibilityNodeData& button2 = sub_body.children[0];
+ EXPECT_EQ(AccessibilityNodeData::ROLE_BUTTON, button2.role);
EXPECT_STREQ("Button 2", UTF16ToUTF8(button2.name).c_str());
- const WebAccessibility& button3 = body.children[2];
- EXPECT_EQ(WebAccessibility::ROLE_BUTTON, button3.role);
+ const AccessibilityNodeData& button3 = body.children[2];
+ EXPECT_EQ(AccessibilityNodeData::ROLE_BUTTON, button3.role);
EXPECT_STREQ("Button 3", UTF16ToUTF8(button3.name).c_str());
}
@@ -369,7 +374,7 @@ IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest,
browser()->OpenURL(OpenURLParams(
url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false));
- const WebAccessibility& tree = GetWebAccessibilityTree();
+ const AccessibilityNodeData& tree = GetAccessibilityNodeDataTree();
base::hash_set<int> ids;
RecursiveAssertUniqueIds(tree, &ids);
}
@@ -397,22 +402,23 @@ IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest,
browser()->OpenURL(OpenURLParams(
url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false));
- const WebAccessibility& tree = GetWebAccessibilityTree();
- const WebAccessibility& table = tree.children[0];
- EXPECT_EQ(WebAccessibility::ROLE_TABLE, table.role);
+ const AccessibilityNodeData& tree = GetAccessibilityNodeDataTree();
+ const AccessibilityNodeData& table = tree.children[0];
+ EXPECT_EQ(AccessibilityNodeData::ROLE_TABLE, table.role);
ASSERT_GE(table.children.size(), 5U);
- EXPECT_EQ(WebAccessibility::ROLE_ROW, table.children[0].role);
- EXPECT_EQ(WebAccessibility::ROLE_ROW, table.children[1].role);
- EXPECT_EQ(WebAccessibility::ROLE_COLUMN, table.children[2].role);
- EXPECT_EQ(WebAccessibility::ROLE_COLUMN, table.children[3].role);
- EXPECT_EQ(WebAccessibility::ROLE_COLUMN, table.children[4].role);
- EXPECT_EQ(3, GetIntAttr(table, WebAccessibility::ATTR_TABLE_COLUMN_COUNT));
- EXPECT_EQ(2, GetIntAttr(table, WebAccessibility::ATTR_TABLE_ROW_COUNT));
-
- const WebAccessibility& cell1 = table.children[0].children[0];
- const WebAccessibility& cell2 = table.children[0].children[1];
- const WebAccessibility& cell3 = table.children[1].children[0];
- const WebAccessibility& cell4 = table.children[1].children[1];
+ EXPECT_EQ(AccessibilityNodeData::ROLE_ROW, table.children[0].role);
+ EXPECT_EQ(AccessibilityNodeData::ROLE_ROW, table.children[1].role);
+ EXPECT_EQ(AccessibilityNodeData::ROLE_COLUMN, table.children[2].role);
+ EXPECT_EQ(AccessibilityNodeData::ROLE_COLUMN, table.children[3].role);
+ EXPECT_EQ(AccessibilityNodeData::ROLE_COLUMN, table.children[4].role);
+ EXPECT_EQ(3,
+ GetIntAttr(table, AccessibilityNodeData::ATTR_TABLE_COLUMN_COUNT));
+ EXPECT_EQ(2, GetIntAttr(table, AccessibilityNodeData::ATTR_TABLE_ROW_COUNT));
+
+ const AccessibilityNodeData& cell1 = table.children[0].children[0];
+ const AccessibilityNodeData& cell2 = table.children[0].children[1];
+ const AccessibilityNodeData& cell3 = table.children[1].children[0];
+ const AccessibilityNodeData& cell4 = table.children[1].children[1];
ASSERT_EQ(6U, table.cell_ids.size());
EXPECT_EQ(cell1.id, table.cell_ids[0]);
@@ -423,25 +429,25 @@ IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest,
EXPECT_EQ(cell4.id, table.cell_ids[5]);
EXPECT_EQ(0, GetIntAttr(cell1,
- WebAccessibility::ATTR_TABLE_CELL_COLUMN_INDEX));
+ AccessibilityNodeData::ATTR_TABLE_CELL_COLUMN_INDEX));
EXPECT_EQ(0, GetIntAttr(cell1,
- WebAccessibility::ATTR_TABLE_CELL_ROW_INDEX));
+ AccessibilityNodeData::ATTR_TABLE_CELL_ROW_INDEX));
EXPECT_EQ(2, GetIntAttr(cell1,
- WebAccessibility::ATTR_TABLE_CELL_COLUMN_SPAN));
+ AccessibilityNodeData::ATTR_TABLE_CELL_COLUMN_SPAN));
EXPECT_EQ(1, GetIntAttr(cell1,
- WebAccessibility::ATTR_TABLE_CELL_ROW_SPAN));
+ AccessibilityNodeData::ATTR_TABLE_CELL_ROW_SPAN));
EXPECT_EQ(2, GetIntAttr(cell2,
- WebAccessibility::ATTR_TABLE_CELL_COLUMN_INDEX));
+ AccessibilityNodeData::ATTR_TABLE_CELL_COLUMN_INDEX));
EXPECT_EQ(1, GetIntAttr(cell2,
- WebAccessibility::ATTR_TABLE_CELL_COLUMN_SPAN));
+ AccessibilityNodeData::ATTR_TABLE_CELL_COLUMN_SPAN));
EXPECT_EQ(0, GetIntAttr(cell3,
- WebAccessibility::ATTR_TABLE_CELL_COLUMN_INDEX));
+ AccessibilityNodeData::ATTR_TABLE_CELL_COLUMN_INDEX));
EXPECT_EQ(1, GetIntAttr(cell3,
- WebAccessibility::ATTR_TABLE_CELL_COLUMN_SPAN));
+ AccessibilityNodeData::ATTR_TABLE_CELL_COLUMN_SPAN));
EXPECT_EQ(1, GetIntAttr(cell4,
- WebAccessibility::ATTR_TABLE_CELL_COLUMN_INDEX));
+ AccessibilityNodeData::ATTR_TABLE_CELL_COLUMN_INDEX));
EXPECT_EQ(2, GetIntAttr(cell4,
- WebAccessibility::ATTR_TABLE_CELL_COLUMN_SPAN));
+ AccessibilityNodeData::ATTR_TABLE_CELL_COLUMN_SPAN));
}
IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest,
@@ -455,13 +461,13 @@ IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest,
GURL url(url_str);
browser()->OpenURL(OpenURLParams(
url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false));
- const WebAccessibility& tree = GetWebAccessibilityTree();
+ const AccessibilityNodeData& tree = GetAccessibilityNodeDataTree();
ASSERT_EQ(1U, tree.children.size());
- const WebAccessibility& textbox = tree.children[0];
+ const AccessibilityNodeData& textbox = tree.children[0];
EXPECT_EQ(
- true, GetBoolAttr(textbox, WebAccessibility::ATTR_CAN_SET_VALUE));
+ true, GetBoolAttr(textbox, AccessibilityNodeData::ATTR_CAN_SET_VALUE));
}
} // namespace
« no previous file with comments | « content/browser/accessibility/browser_accessibility_win_unittest.cc ('k') | content/browser/accessibility/renderer_accessibility_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698