Replace ui::AXViewState with AXNodeData and AXActionData

ui/views/controls/textfield/textfield_unittest.cc

 // Copyright 2014 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/textfield/textfield.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/format_macros.h"
 #include "base/i18n/rtl.h"
 #include "base/macros.h"
 #include "base/pickle.h"
 #include "base/strings/string16.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
-#include "ui/accessibility/ax_view_state.h"
+#include "ui/accessibility/ax_node_data.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/ime/input_method_base.h"
 #include "ui/base/ime/input_method_delegate.h"
 #include "ui/base/ime/input_method_factory.h"
 #include "ui/base/ime/text_edit_commands.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/base/ui_base_switches_util.h"
@@ skipping 2956 matching lines @@
   Tap(tap_point);
   textfield_->GetSelectionRange(&range);
   EXPECT_TRUE(test_api_->touch_selection_controller());
   EXPECT_EQ(tap_range, range);
 }
 
 TEST_F(TextfieldTest, AccessiblePasswordTest) {
   InitTextfield();
   textfield_->SetText(ASCIIToUTF16("password"));
 
-  ui::AXViewState state_regular;
-  textfield_->GetAccessibleState(&state_regular);
-  EXPECT_EQ(ui::AX_ROLE_TEXT_FIELD, state_regular.role);
-  EXPECT_EQ(ASCIIToUTF16("password"), state_regular.value);
-  EXPECT_FALSE(state_regular.HasStateFlag(ui::AX_STATE_PROTECTED));
+  ui::AXNodeData node_data_regular;
+  node_data_regular.state = 0;
+  textfield_->GetAccessibleNodeData(&node_data_regular);
+  EXPECT_EQ(ui::AX_ROLE_TEXT_FIELD, node_data_regular.role);
+  EXPECT_EQ(ASCIIToUTF16("password"),
+            node_data_regular.GetString16Attribute(ui::AX_ATTR_VALUE));
+  EXPECT_FALSE(node_data_regular.HasStateFlag(ui::AX_STATE_PROTECTED));
 
   textfield_->SetTextInputType(ui::TEXT_INPUT_TYPE_PASSWORD);
-  ui::AXViewState state_protected;
-  textfield_->GetAccessibleState(&state_protected);
-  EXPECT_EQ(ui::AX_ROLE_TEXT_FIELD, state_protected.role);
-  EXPECT_EQ(ASCIIToUTF16("********"), state_protected.value);
-  EXPECT_TRUE(state_protected.HasStateFlag(ui::AX_STATE_PROTECTED));
+  ui::AXNodeData node_data_protected;
+  node_data_protected.state = 0;
+  textfield_->GetAccessibleNodeData(&node_data_protected);
+  EXPECT_EQ(ui::AX_ROLE_TEXT_FIELD, node_data_protected.role);
+  EXPECT_EQ(ASCIIToUTF16("********"),
+            node_data_protected.GetString16Attribute(ui::AX_ATTR_VALUE));
+  EXPECT_TRUE(node_data_protected.HasStateFlag(ui::AX_STATE_PROTECTED));
 }
 
 }  // namespace views