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

ui/views/controls/button/custom_button.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 "ui/views/controls/button/custom_button.h"
 
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_codes.h"
@@ skipping 338 matching lines @@
   // (since disabled buttons may still be able to be dragged).
   if (state_ != STATE_DISABLED)
     SetState(STATE_NORMAL);
   AnimateInkDrop(InkDropState::HIDDEN, nullptr /* event */);
 }
 
 void CustomButton::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   Button::GetAccessibleNodeData(node_data);
   switch (state_) {
     case STATE_HOVERED:
-      node_data->AddStateFlag(ui::AX_STATE_HOVERED);
+      node_data->AddState(ui::AX_STATE_HOVERED);
       break;
     case STATE_PRESSED:
-      node_data->AddStateFlag(ui::AX_STATE_PRESSED);
+      node_data->AddState(ui::AX_STATE_PRESSED);
       break;
     case STATE_DISABLED:
-      node_data->AddStateFlag(ui::AX_STATE_DISABLED);
+      node_data->AddState(ui::AX_STATE_DISABLED);
       break;
     case STATE_NORMAL:
     case STATE_COUNT:
       // No additional accessibility node_data set for this button node_data.
       break;
   }
   if (enabled()) {
     node_data->AddIntAttribute(ui::AX_ATTR_ACTION,
                                ui::AX_SUPPORTED_ACTION_PRESS);
   }
@@ skipping 115 matching lines @@
           views::InkDropState::ACTION_PENDING ||
       GetInkDrop()->GetTargetInkDropState() ==
           views::InkDropState::ALTERNATE_ACTION_PENDING) {
     AnimateInkDrop(views::InkDropState::HIDDEN,
                    ui::LocatedEvent::FromIfValid(&event));
   }
   Button::OnClickCanceled(event);
 }
 
 }  // namespace views