summaryrefslogtreecommitdiffstats
path: root/content/browser/accessibility/browser_accessibility_win_unittest.cc
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-02 11:31:26 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-02 11:31:26 +0000
commit648e7b91fdb036322e45446092d343f963ed242c (patch)
tree6f46fb66307b141823b2cfcdf41483f02d94ca1b /content/browser/accessibility/browser_accessibility_win_unittest.cc
parentde31638a9e61f7f5db0f5a6eba9036a7998e70ae (diff)
downloadchromium_src-648e7b91fdb036322e45446092d343f963ed242c.zip
chromium_src-648e7b91fdb036322e45446092d343f963ed242c.tar.gz
chromium_src-648e7b91fdb036322e45446092d343f963ed242c.tar.bz2
Revert of Refactor content/renderer/accessibility to use AXTreeSerializer. (https://codereview.chromium.org/125763003/)
Reason for revert: Breaks asan builders: http://build.chromium.org/p/chromium.memory/buildstatus?builder=Linux%20ASan%2BLSan%20Tests%20%283%29&number=1347 Original issue's description: > Refactor content/renderer/accessibility to use AXTreeSerializer. > > This removes the confusing code in content/renderer/accessibility that > serializes updates from Blink's accessibility tree, and replaces it with > calls to the new cleaner and fully-unit-tested AXTreeSerializer class. > > BUG=316726 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=261099 TBR=dtseng@chromium.org,aboxhall@chromium.org,tsepez@chromium.org,jam@chromium.org,aarya@google.com,dmazzoni@chromium.org NOTREECHECKS=true NOTRY=true BUG=316726 Review URL: https://codereview.chromium.org/222073002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261107 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/accessibility/browser_accessibility_win_unittest.cc')
-rw-r--r--content/browser/accessibility/browser_accessibility_win_unittest.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/content/browser/accessibility/browser_accessibility_win_unittest.cc b/content/browser/accessibility/browser_accessibility_win_unittest.cc
index 42b211b..83edae7 100644
--- a/content/browser/accessibility/browser_accessibility_win_unittest.cc
+++ b/content/browser/accessibility/browser_accessibility_win_unittest.cc
@@ -235,7 +235,7 @@ TEST_F(BrowserAccessibilityTest, TestChildrenChange) {
text2.SetName("old text");
AccessibilityHostMsg_EventParams param;
param.event_type = ui::AX_EVENT_CHILDREN_CHANGED;
- param.update.nodes.push_back(text2);
+ param.nodes.push_back(text2);
param.id = text2.id;
std::vector<AccessibilityHostMsg_EventParams> events;
events.push_back(param);
@@ -307,7 +307,7 @@ TEST_F(BrowserAccessibilityTest, TestChildrenChangeNoLeaks) {
root.child_ids.clear();
AccessibilityHostMsg_EventParams param;
param.event_type = ui::AX_EVENT_CHILDREN_CHANGED;
- param.update.nodes.push_back(root);
+ param.nodes.push_back(root);
param.id = root.id;
std::vector<AccessibilityHostMsg_EventParams> events;
events.push_back(param);
@@ -637,8 +637,8 @@ TEST_F(BrowserAccessibilityTest, TestCreateEmptyDocument) {
params.push_back(AccessibilityHostMsg_EventParams());
AccessibilityHostMsg_EventParams* msg = &params[0];
msg->event_type = ui::AX_EVENT_LOAD_COMPLETE;
- msg->update.nodes.push_back(tree1_1);
- msg->update.nodes.push_back(tree1_2);
+ msg->nodes.push_back(tree1_1);
+ msg->nodes.push_back(tree1_2);
msg->id = tree1_1.id;
manager->OnAccessibilityEvents(params);
@@ -662,9 +662,9 @@ TEST_F(BrowserAccessibilityTest, TestCreateEmptyDocument) {
tree2_2.id = 3;
tree2_2.role = ui::AX_ROLE_BUTTON;
- msg->update.nodes.clear();
- msg->update.nodes.push_back(tree2_1);
- msg->update.nodes.push_back(tree2_2);
+ msg->nodes.clear();
+ msg->nodes.push_back(tree2_1);
+ msg->nodes.push_back(tree2_2);
msg->id = tree2_1.id;
// Fire another load complete.