A11y: Add/refactor methods for manipulating bitfields on AXNodeData.

ui/accessibility/ax_tree_unittest.cc

 // Copyright 2013 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 "ui/accessibility/ax_tree.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 194 matching lines @@
   std::vector<int32_t> change_finished_ids_;
   std::vector<std::string> attribute_change_log_;
 };
 
 }  // namespace
 
 TEST(AXTreeTest, SerializeSimpleAXTree) {
   AXNodeData root;
   root.id = 1;
   root.role = AX_ROLE_DIALOG;
-  root.state = 1 << AX_STATE_FOCUSABLE;
+  root.AddState(AX_STATE_FOCUSABLE);
   root.location = gfx::RectF(0, 0, 800, 600);
   root.child_ids.push_back(2);
   root.child_ids.push_back(3);
 
   AXNodeData button;
   button.id = 2;
   button.role = AX_ROLE_BUTTON;
-  button.state = 0;
   button.location = gfx::RectF(20, 20, 200, 30);
 
   AXNodeData checkbox;
   checkbox.id = 3;
   checkbox.role = AX_ROLE_CHECK_BOX;
-  checkbox.state = 0;
   checkbox.location = gfx::RectF(20, 50, 200, 30);
 
   AXTreeUpdate initial_state;
   initial_state.root_id = 1;
   initial_state.nodes.push_back(root);
   initial_state.nodes.push_back(button);
   initial_state.nodes.push_back(checkbox);
   initial_state.has_tree_data = true;
   initial_state.tree_data.title = "Title";
   AXSerializableTree src_tree(initial_state);
@@ skipping 28 matching lines @@
       "id=1 dialog FOCUSABLE (0, 0)-(800, 600) child_ids=2,3\n"
       "  id=2 button (20, 20)-(200, 30)\n"
       "  id=3 checkBox (20, 50)-(200, 30)\n",
       dst_tree.ToString());
 }
 
 TEST(AXTreeTest, SerializeAXTreeUpdate) {
   AXNodeData list;
   list.id = 3;
   list.role = AX_ROLE_LIST;
-  list.state = 0;
   list.child_ids.push_back(4);
   list.child_ids.push_back(5);
   list.child_ids.push_back(6);
 
   AXNodeData list_item_2;
   list_item_2.id = 5;
   list_item_2.role = AX_ROLE_LIST_ITEM;
-  list_item_2.state = 0;
 
   AXNodeData list_item_3;
   list_item_3.id = 6;
   list_item_3.role = AX_ROLE_LIST_ITEM;
-  list_item_3.state = 0;
 
   AXNodeData button;
   button.id = 7;
   button.role = AX_ROLE_BUTTON;
-  button.state = 0;
 
   AXTreeUpdate update;
   update.root_id = 3;
   update.nodes.push_back(list);
   update.nodes.push_back(list_item_2);
   update.nodes.push_back(list_item_3);
   update.nodes.push_back(button);
 
   EXPECT_EQ(
       "AXTreeUpdate: root id 3\n"
@@ skipping 262 matching lines @@
   ASSERT_EQ(true, fake_delegate.root_changed());
 
   tree.SetDelegate(NULL);
 }
 
 // UAF caught by ax_tree_fuzzer
 TEST(AXTreeTest, BogusAXTree) {
   AXTreeUpdate initial_state;
   AXNodeData node;
   node.id = 0;
-  node.state = 0;
   initial_state.nodes.push_back(node);
   initial_state.nodes.push_back(node);
   ui::AXTree tree;
   tree.Unserialize(initial_state);
 }
 
 // UAF caught by ax_tree_fuzzer
 TEST(AXTreeTest, BogusAXTree2) {
   AXTreeUpdate initial_state;
   AXNodeData node;
   node.id = 0;
-  node.state = 0;
   initial_state.nodes.push_back(node);
   AXNodeData node2;
   node2.id = 0;
-  node2.state = 0;
   node2.child_ids.push_back(0);
   node2.child_ids.push_back(0);
   initial_state.nodes.push_back(node2);
   ui::AXTree tree;
   tree.Unserialize(initial_state);
 }
 
 // UAF caught by ax_tree_fuzzer
 TEST(AXTreeTest, BogusAXTree3) {
   AXTreeUpdate initial_state;
   AXNodeData node;
   node.id = 0;
-  node.state = 0;
   node.child_ids.push_back(1);
   initial_state.nodes.push_back(node);
 
   AXNodeData node2;
   node2.id = 1;
-  node2.state = 0;
   node2.child_ids.push_back(1);
   node2.child_ids.push_back(1);
   initial_state.nodes.push_back(node2);
 
   ui::AXTree tree;
   tree.Unserialize(initial_state);
 }
 
 TEST(AXTreeTest, RoleAndStateChangeCallbacks) {
   AXTreeUpdate initial_state;
   initial_state.root_id = 1;
   initial_state.nodes.resize(1);
   initial_state.nodes[0].id = 1;
   initial_state.nodes[0].role = AX_ROLE_BUTTON;
-  initial_state.nodes[0].state = 0;
   initial_state.nodes[0].AddIntAttribute(ui::AX_ATTR_CHECKED_STATE,
                                          ui::AX_CHECKED_STATE_TRUE);
-  initial_state.nodes[0].AddStateFlag(AX_STATE_FOCUSABLE);
+  initial_state.nodes[0].AddState(AX_STATE_FOCUSABLE);
   AXTree tree(initial_state);
 
   FakeAXTreeDelegate fake_delegate;
   tree.SetDelegate(&fake_delegate);
 
   // Change the role and state.
   AXTreeUpdate update;
   update.root_id = 1;
   update.nodes.resize(1);
   update.nodes[0].id = 1;
   update.nodes[0].role = AX_ROLE_CHECK_BOX;
-  update.nodes[0].state = 0;
   update.nodes[0].AddIntAttribute(ui::AX_ATTR_CHECKED_STATE,
                                   ui::AX_CHECKED_STATE_FALSE);
-  update.nodes[0].AddStateFlag(AX_STATE_FOCUSABLE);
-  update.nodes[0].AddStateFlag(AX_STATE_VISITED);
+  update.nodes[0].AddState(AX_STATE_FOCUSABLE);
+  update.nodes[0].AddState(AX_STATE_VISITED);
   EXPECT_TRUE(tree.Unserialize(update));
 
   const std::vector<std::string>& change_log =
       fake_delegate.attribute_change_log();
   ASSERT_EQ(3U, change_log.size());
   EXPECT_EQ("Role changed from button to checkBox", change_log[0]);
   EXPECT_EQ("visited changed to true", change_log[1]);
   EXPECT_EQ("checkedState changed from 2 to 1", change_log[2]);
 
   tree.SetDelegate(NULL);
@@ skipping 131 matching lines @@
       fake_delegate2.attribute_change_log();
   ASSERT_EQ(3U, change_log2.size());
   EXPECT_EQ("controlsIds changed from 2,2 to ", change_log2[0]);
   EXPECT_EQ("detailsIds changed from 3 to 2,2", change_log2[1]);
   EXPECT_EQ("flowtoIds changed from  to 3", change_log2[2]);
 
   tree.SetDelegate(NULL);
 }
 
 }  // namespace ui