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

ui/views/controls/menu/menu_item_view.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/menu/menu_item_view.h"
 
 #include <stddef.h>
 
 #include "base/i18n/case_conversion.h"
 #include "base/macros.h"
@@ skipping 144 matching lines @@
 
 void MenuItemView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   node_data->role = ui::AX_ROLE_MENU_ITEM;
 
   base::string16 item_text;
   if (IsContainer()) {
     // The first child is taking over, just use its accessible name instead of
     // |title_|.
     View* child = child_at(0);
     ui::AXNodeData node_data;
+    node_data.ClearBitfields();
     child->GetAccessibleNodeData(&node_data);
     item_text = node_data.GetString16Attribute(ui::AX_ATTR_NAME);
   } else {
     item_text = title_;
   }
   node_data->SetName(GetAccessibleNameForMenuItem(item_text, GetMinorText()));
 
   switch (GetType()) {
     case SUBMENU:
-      node_data->AddStateFlag(ui::AX_STATE_HASPOPUP);
+      node_data->AddState(ui::AX_STATE_HASPOPUP);
       break;
     case CHECKBOX:
     case RADIO: {
       const bool is_checked = GetDelegate()->IsItemChecked(GetCommand());
       const ui::AXCheckedState checked_state =
           is_checked ? ui::AX_CHECKED_STATE_TRUE : ui::AX_CHECKED_STATE_FALSE;
       node_data->AddIntAttribute(ui::AX_ATTR_CHECKED_STATE, checked_state);
     } break;
     case NORMAL:
     case SEPARATOR:
@@ skipping 883 matching lines @@
     } else {
       const Type& type = menu_item->GetType();
       if (type == CHECKBOX || type == RADIO)
         return true;
     }
   }
   return false;
 }
 
 }  // namespace views