Replace ui::AXViewState with AXNodeData and AXActionData

ui/views/controls/menu/menu_item_view.cc

Index: ui/views/controls/menu/menu_item_view.cc
diff --git a/ui/views/controls/menu/menu_item_view.cc b/ui/views/controls/menu/menu_item_view.cc
index 2107c9a328f7fae7d2fe4ded89c7e2fb98ee75ba..7e94375e2b5c4459b632ab9ae50aabc4675ee1b3 100644
--- a/ui/views/controls/menu/menu_item_view.cc
+++ b/ui/views/controls/menu/menu_item_view.cc
@@ -9,7 +9,7 @@
 #include "base/i18n/case_conversion.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
-#include "ui/accessibility/ax_view_state.h"
+#include "ui/accessibility/ax_node_data.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/gfx/canvas.h"
@@ -153,30 +153,30 @@ bool MenuItemView::GetTooltipText(const gfx::Point& p,
   return !tooltip->empty();
 }
 
-void MenuItemView::GetAccessibleState(ui::AXViewState* state) {
-  state->role = ui::AX_ROLE_MENU_ITEM;
+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::AXViewState state;
-    child->GetAccessibleState(&state);
-    item_text = state.name;
+    ui::AXNodeData node_data;
+    child->GetAccessibleNodeData(&node_data);
+    item_text = node_data.GetString16Attribute(ui::AX_ATTR_NAME);
   } else {
     item_text = title_;
   }
-  state->name = GetAccessibleNameForMenuItem(item_text, GetMinorText());
+  node_data->SetName(GetAccessibleNameForMenuItem(item_text, GetMinorText()));
 
   switch (GetType()) {
     case SUBMENU:
-      state->AddStateFlag(ui::AX_STATE_HASPOPUP);
+      node_data->AddStateFlag(ui::AX_STATE_HASPOPUP);
       break;
     case CHECKBOX:
     case RADIO:
       if (GetDelegate()->IsItemChecked(GetCommand()))
-        state->AddStateFlag(ui::AX_STATE_CHECKED);
+        node_data->AddStateFlag(ui::AX_STATE_CHECKED);
       break;
     case NORMAL:
     case SEPARATOR: