Replace ui::AXViewState with AXNodeData and AXActionData

ash/common/system/user/tray_user_unittest.cc

 // Copyright 2013 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 <vector>
 
 #include "ash/common/shell_delegate.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/user/tray_user.h"
 #include "ash/common/system/user/tray_user_separator.h"
 #include "ash/common/system/user/user_view.h"
 #include "ash/common/test/test_session_state_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/ash_test_helper.h"
 #include "ash/test/test_shell_delegate.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user_info.h"
-#include "ui/accessibility/ax_view_state.h"
+#include "ui/accessibility/ax_node_data.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/animation/animation_container_element.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 class TrayUserTest : public test::AshTestBase {
  public:
   TrayUserTest() = default;
@@ skipping 118 matching lines @@
   tray()->CloseSystemBubble();
 }
 
 TEST_F(TrayUserTest, AccessibleLabelContainsSingleUserInfo) {
   InitializeParameters(1, false);
   ui::test::EventGenerator& generator = GetEventGenerator();
   ShowTrayMenu(&generator);
 
   views::View* view =
       tray_user(0)->user_view_for_test()->user_card_view_for_test();
-  ui::AXViewState state;
-  view->GetAccessibleState(&state);
+  ui::AXNodeData node_data;
+  view->GetAccessibleNodeData(&node_data);
   EXPECT_EQ(
       base::UTF8ToUTF16("Über tray Über tray Über tray Über tray First@tray"),
-      state.name);
-  EXPECT_EQ(ui::AX_ROLE_STATIC_TEXT, state.role);
+      node_data.GetString16Attribute(ui::AX_ATTR_NAME));
+  EXPECT_EQ(ui::AX_ROLE_STATIC_TEXT, node_data.role);
 }
 
 TEST_F(TrayUserTest, AccessibleLabelContainsMultiUserInfo) {
   InitializeParameters(1, true);
   ui::test::EventGenerator& generator = GetEventGenerator();
   ShowTrayMenu(&generator);
 
   views::View* view =
       tray_user(0)->user_view_for_test()->user_card_view_for_test();
-  ui::AXViewState state;
-  view->GetAccessibleState(&state);
+  ui::AXNodeData node_data;
+  view->GetAccessibleNodeData(&node_data);
   EXPECT_EQ(
       base::UTF8ToUTF16("Über tray Über tray Über tray Über tray First@tray"),
-      state.name);
-  EXPECT_EQ(ui::AX_ROLE_BUTTON, state.role);
+      node_data.GetString16Attribute(ui::AX_ATTR_NAME));
+  EXPECT_EQ(ui::AX_ROLE_BUTTON, node_data.role);
 }
 
 #if defined(OS_CHROMEOS)
 // Make sure that in multi user mode the user panel can be activated and there
 // will be one panel for each user plus one additional separator at the end.
 // Note: the mouse watcher (for automatic closing upon leave) cannot be tested
 // here since it does not work with the event system in unit tests.
 TEST_F(TrayUserTest, MultiUserModeDoesNotAllowToAddUser) {
   InitializeParameters(1, true);
 
@@ skipping 69 matching lines @@
   // Since the name is capitalized, the email should be different than the
   // user_id.
   EXPECT_NE(active_user->GetAccountId().GetUserEmail(),
             second_user->GetDisplayEmail());
   tray()->CloseSystemBubble();
 }
 
 #endif
 
 }  // namespace ash