| Index: ash/common/system/user/tray_user_unittest.cc
|
| diff --git a/ash/common/system/user/tray_user_unittest.cc b/ash/common/system/user/tray_user_unittest.cc
|
| index 0e4284ac563723b498ac30e6741bbf9cb0139450..2308fe279fca54332f6938cb02a607805aa283b2 100644
|
| --- a/ash/common/system/user/tray_user_unittest.cc
|
| +++ b/ash/common/system/user/tray_user_unittest.cc
|
| @@ -18,7 +18,7 @@
|
| #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"
|
| @@ -157,12 +157,12 @@ TEST_F(TrayUserTest, AccessibleLabelContainsSingleUserInfo) {
|
|
|
| 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) {
|
| @@ -172,12 +172,12 @@ TEST_F(TrayUserTest, AccessibleLabelContainsMultiUserInfo) {
|
|
|
| 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)
|
|
|