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

content/browser/accessibility/one_shot_accessibility_tree_search_unittest.cc

 // Copyright 2015 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 "content/browser/accessibility/one_shot_accessibility_tree_search.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "content/browser/accessibility/browser_accessibility.h"
@@ skipping 33 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MAYBE_OneShotAccessibilityTreeSearchTest);
 };
 
 void MAYBE_OneShotAccessibilityTreeSearchTest::SetUp() {
   ui::AXNodeData root;
   root.id = 1;
   root.SetName("Document");
   root.role = ui::AX_ROLE_ROOT_WEB_AREA;
-  root.state = 0;
   root.child_ids.push_back(2);
   root.child_ids.push_back(3);
   root.child_ids.push_back(6);
 
   ui::AXNodeData heading;
   heading.id = 2;
   heading.SetName("Heading");
   heading.role = ui::AX_ROLE_HEADING;
-  heading.state = 0;
 
   ui::AXNodeData list;
   list.id = 3;
   list.role = ui::AX_ROLE_LIST;
-  list.state = 0;
   list.child_ids.push_back(4);
   list.child_ids.push_back(5);
 
   ui::AXNodeData list_item_1;
   list_item_1.id = 4;
   list_item_1.SetName("Autobots");
   list_item_1.role = ui::AX_ROLE_LIST_ITEM;
-  list_item_1.state = 0;
 
   ui::AXNodeData list_item_2;
   list_item_2.id = 5;
   list_item_2.SetName("Decepticons");
   list_item_2.role = ui::AX_ROLE_LIST_ITEM;
-  list_item_2.state = 0;
 
   ui::AXNodeData footer;
   footer.id = 6;
   footer.SetName("Footer");
   footer.role = ui::AX_ROLE_FOOTER;
-  footer.state = 1 << ui::AX_STATE_OFFSCREEN;
+  footer.AddState(ui::AX_STATE_OFFSCREEN);
 
   tree_.reset(new TestBrowserAccessibilityManager(
       MakeAXTreeUpdate(root, heading, list, list_item_1, list_item_2, footer)));
 }
 
 TEST_F(MAYBE_OneShotAccessibilityTreeSearchTest, GetAll) {
   OneShotAccessibilityTreeSearch search(tree_->GetRoot());
   ASSERT_EQ(6U, search.CountMatches());
 }
 
@@ skipping 128 matching lines @@
   search.AddPredicate([](BrowserAccessibility* start,
                          BrowserAccessibility* current) {
     return (current->GetId() % 2 == 1);
   });
   ASSERT_EQ(2U, search.CountMatches());
   EXPECT_EQ(3, search.GetMatchAtIndex(0)->GetId());
   EXPECT_EQ(5, search.GetMatchAtIndex(1)->GetId());
 }
 
 }  // namespace content