| Index: ui/accessibility/ax_node_position_unittest.cc
|
| diff --git a/ui/accessibility/ax_node_position_unittest.cc b/ui/accessibility/ax_node_position_unittest.cc
|
| index 7b720acad849b347a433243e239d8385b49be6bb..277c9997a7ad73196d0a5fc16d646e8cb29c043b 100644
|
| --- a/ui/accessibility/ax_node_position_unittest.cc
|
| +++ b/ui/accessibility/ax_node_position_unittest.cc
|
| @@ -116,12 +116,12 @@ void AXPositionTest::SetUp() {
|
| inline_box2_.id = INLINE_BOX2_ID;
|
|
|
| root_.role = AX_ROLE_DIALOG;
|
| - root_.state = 1 << AX_STATE_FOCUSABLE;
|
| + root_.AddState(AX_STATE_FOCUSABLE);
|
| root_.SetName(std::string("ButtonCheck box") + TEXT_VALUE);
|
| root_.location = gfx::RectF(0, 0, 800, 600);
|
|
|
| button_.role = AX_ROLE_BUTTON;
|
| - button_.state = 1 << AX_STATE_HASPOPUP;
|
| + button_.AddState(AX_STATE_HASPOPUP);
|
| button_.SetName("Button");
|
| button_.location = gfx::RectF(20, 20, 200, 30);
|
| button_.AddIntListAttribute(AX_ATTR_WORD_STARTS, std::vector<int32_t>{0});
|
| @@ -141,7 +141,7 @@ void AXPositionTest::SetUp() {
|
| root_.child_ids.push_back(check_box_.id);
|
|
|
| text_field_.role = AX_ROLE_TEXT_FIELD;
|
| - text_field_.state = 1 << AX_STATE_EDITABLE;
|
| + text_field_.AddState(AX_STATE_EDITABLE);
|
| text_field_.SetValue(TEXT_VALUE);
|
| text_field_.AddIntListAttribute(AX_ATTR_CACHED_LINE_STARTS,
|
| std::vector<int32_t>{0, 7});
|
| @@ -151,13 +151,13 @@ void AXPositionTest::SetUp() {
|
| root_.child_ids.push_back(text_field_.id);
|
|
|
| static_text1_.role = AX_ROLE_STATIC_TEXT;
|
| - static_text1_.state = 1 << AX_STATE_EDITABLE;
|
| + static_text1_.AddState(AX_STATE_EDITABLE);
|
| static_text1_.SetName("Line 1");
|
| static_text1_.AddIntAttribute(AX_ATTR_NEXT_ON_LINE_ID, line_break_.id);
|
| static_text1_.child_ids.push_back(inline_box1_.id);
|
|
|
| inline_box1_.role = AX_ROLE_INLINE_TEXT_BOX;
|
| - inline_box1_.state = 1 << AX_STATE_EDITABLE;
|
| + inline_box1_.AddState(AX_STATE_EDITABLE);
|
| inline_box1_.SetName("Line 1");
|
| inline_box1_.AddIntListAttribute(AX_ATTR_WORD_STARTS,
|
| std::vector<int32_t>{0, 5});
|
| @@ -166,17 +166,17 @@ void AXPositionTest::SetUp() {
|
| inline_box1_.AddIntAttribute(AX_ATTR_NEXT_ON_LINE_ID, line_break_.id);
|
|
|
| line_break_.role = AX_ROLE_LINE_BREAK;
|
| - line_break_.state = 1 << AX_STATE_EDITABLE;
|
| + line_break_.AddState(AX_STATE_EDITABLE);
|
| line_break_.SetName("\n");
|
| line_break_.AddIntAttribute(AX_ATTR_PREVIOUS_ON_LINE_ID, inline_box1_.id);
|
|
|
| static_text2_.role = AX_ROLE_STATIC_TEXT;
|
| - static_text2_.state = 1 << AX_STATE_EDITABLE;
|
| + static_text2_.AddState(AX_STATE_EDITABLE);
|
| static_text2_.SetName("Line 2");
|
| static_text2_.child_ids.push_back(inline_box2_.id);
|
|
|
| inline_box2_.role = AX_ROLE_INLINE_TEXT_BOX;
|
| - inline_box2_.state = 1 << AX_STATE_EDITABLE;
|
| + inline_box2_.AddState(AX_STATE_EDITABLE);
|
| inline_box2_.SetName("Line 2");
|
| inline_box2_.AddIntListAttribute(AX_ATTR_WORD_STARTS,
|
| std::vector<int32_t>{0, 5});
|
|
|