Replace ui::AXViewState with AXNodeData and AXActionData

chrome/browser/ui/views/toolbar/toolbar_action_view_unittest.cc

 // Copyright 2015 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 "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_web_contents_factory.h"
-#include "ui/accessibility/ax_view_state.h"
+#include "ui/accessibility/ax_node_data.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/views/test/views_test_base.h"
 
 namespace {
 
 // A test delegate for a toolbar action view.
 class TestToolbarActionViewDelegate : public ToolbarActionView::Delegate {
  public:
   TestToolbarActionViewDelegate() : shown_in_menu_(false),
                                     overflow_reference_view_(nullptr),
@@ skipping 184 matching lines @@
   view.set_owned_by_client();
   view.SetBoundsRect(gfx::Rect(0, 0, 200, 20));
   widget()->SetContentsView(&view);
   widget()->Show();
 
   // Check that the tooltip and accessible state of the view match the
   // controller's.
   base::string16 tooltip_test;
   EXPECT_TRUE(view.GetTooltipText(gfx::Point(), &tooltip_test));
   EXPECT_EQ(tooltip, tooltip_test);
-  ui::AXViewState ax_state;
-  view.GetAccessibleState(&ax_state);
-  EXPECT_EQ(name, ax_state.name);
+  ui::AXNodeData ax_node_data;
+  view.GetAccessibleNodeData(&ax_node_data);
+  EXPECT_EQ(name, ax_node_data.GetString16Attribute(ui::AX_ATTR_NAME));
 
   // The button should start in normal state, with no actions executed.
   EXPECT_EQ(views::Button::STATE_NORMAL, view.state());
   EXPECT_EQ(0, controller.execute_action_count());
 
   // Click the button. This should execute it.
   generator.MoveMouseTo(gfx::Point(10, 10));
   generator.ClickLeftButton();
   EXPECT_EQ(1, controller.execute_action_count());
 
@@ skipping 43 matching lines @@
   // If the view isn't visible, the overflow button should be pressed for
   // popups.
   view.SetVisible(false);
   controller.ShowPopup(true);
   EXPECT_EQ(views::Button::STATE_NORMAL, view.state());
   EXPECT_EQ(views::Button::STATE_PRESSED, overflow_button.state());
   controller.HidePopup();
   EXPECT_EQ(views::Button::STATE_NORMAL, view.state());
   EXPECT_EQ(views::Button::STATE_NORMAL, overflow_button.state());
 }