Refactor content/renderer/accessibility to use AXTreeSerializer (re-land).

content/browser/accessibility/browser_accessibility_manager_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/accessibility/browser_accessibility.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #if defined(OS_WIN)
 #include "content/browser/accessibility/browser_accessibility_win.h"
@@ skipping 249 matching lines @@
   // Check the index in parent.
   EXPECT_EQ(0, child1_accessible->index_in_parent());
   EXPECT_EQ(1, child2_accessible->index_in_parent());
   EXPECT_EQ(2, child3_accessible->index_in_parent());
 
   // Process a notification containing the changed subtree.
   std::vector<AccessibilityHostMsg_EventParams> params;
   params.push_back(AccessibilityHostMsg_EventParams());
   AccessibilityHostMsg_EventParams* msg = &params[0];
   msg->event_type = ui::AX_EVENT_CHILDREN_CHANGED;
-  msg->nodes.push_back(tree2_root);
-  msg->nodes.push_back(tree2_child0);
+  msg->update.nodes.push_back(tree2_root);
+  msg->update.nodes.push_back(tree2_child0);
   msg->id = tree2_root.id;
   manager->OnAccessibilityEvents(params);
 
   // There should be 5 objects now: the 4 from the new tree, plus the
   // reference to child3 we kept.
   EXPECT_EQ(5, CountedBrowserAccessibility::global_obj_count_);
 
   // Check that our references to the root, child1, and child2 are still valid,
   // but that the reference to child3 is now invalid.
   EXPECT_TRUE(root_accessible->instance_active());
@@ skipping 155 matching lines @@
   // Check the index in parent.
   EXPECT_EQ(1, child2_accessible->index_in_parent());
   EXPECT_EQ(2, child3_accessible->index_in_parent());
 
   // Process a notification containing the changed subtree rooted at
   // the container.
   std::vector<AccessibilityHostMsg_EventParams> params;
   params.push_back(AccessibilityHostMsg_EventParams());
   AccessibilityHostMsg_EventParams* msg = &params[0];
   msg->event_type = ui::AX_EVENT_CHILDREN_CHANGED;
-  msg->nodes.push_back(tree2_container);
-  msg->nodes.push_back(tree2_child0);
-  msg->nodes.push_back(tree2_grandchild0);
+  msg->update.nodes.push_back(tree2_container);
+  msg->update.nodes.push_back(tree2_child0);
+  msg->update.nodes.push_back(tree2_grandchild0);
   msg->id = tree2_container.id;
   manager->OnAccessibilityEvents(params);
 
   // There should be 9 objects now: the 8 from the new tree, plus the
   // reference to child3 we kept.
   EXPECT_EQ(9, CountedBrowserAccessibility::global_obj_count_);
 
   // Check that our references to the root and container and child2 are
   // still valid, but that the reference to child3 is now invalid.
   EXPECT_TRUE(root_accessible->instance_active());
@@ skipping 84 matching lines @@
           NULL,
           new CountedBrowserAccessibilityFactory());
   manager->UpdateNodesForTesting(tree1_2, tree1_3, tree1_4);
   ASSERT_EQ(4, CountedBrowserAccessibility::global_obj_count_);
 
   // Process a notification containing the changed subtree.
   std::vector<AccessibilityHostMsg_EventParams> params;
   params.push_back(AccessibilityHostMsg_EventParams());
   AccessibilityHostMsg_EventParams* msg = &params[0];
   msg->event_type = ui::AX_EVENT_CHILDREN_CHANGED;
-  msg->nodes.push_back(tree2_1);
-  msg->nodes.push_back(tree2_4);
-  msg->nodes.push_back(tree2_5);
-  msg->nodes.push_back(tree2_6);
+  msg->update.nodes.push_back(tree2_1);
+  msg->update.nodes.push_back(tree2_4);
+  msg->update.nodes.push_back(tree2_5);
+  msg->update.nodes.push_back(tree2_6);
   msg->id = tree2_1.id;
   manager->OnAccessibilityEvents(params);
 
   // There should be 4 objects now.
   EXPECT_EQ(4, CountedBrowserAccessibility::global_obj_count_);
 
   // Delete the manager and make sure all memory is cleaned up.
   delete manager;
   ASSERT_EQ(0, CountedBrowserAccessibility::global_obj_count_);
 }
@@ skipping 312 matching lines @@
             root_accessible->GetLocalBoundsForRange(1, 2).ToString());
 
   EXPECT_EQ(gfx::Rect(120, 100, 80, 20).ToString(),
             root_accessible->GetLocalBoundsForRange(1, 3).ToString());
 
   EXPECT_EQ(gfx::Rect(100, 100, 100, 20).ToString(),
             root_accessible->GetLocalBoundsForRange(0, 4).ToString());
 }
 
 }  // namespace content