Replace ui::AXViewState with AXNodeData and AXActionData

ui/views/widget/native_widget_mac_accessibility_unittest.mm

 // Copyright 2016 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 <memory>
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #import "testing/gtest_mac.h"
 #include "ui/accessibility/ax_enums.h"
-#include "ui/accessibility/ax_view_state.h"
+#include "ui/accessibility/ax_node_data.h"
 #import "ui/accessibility/platform/ax_platform_node_mac.h"
 #include "ui/base/ime/text_input_type.h"
 #import "ui/gfx/mac/coordinate_conversion.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/views/widget/widget.h"
 
 // Expose some methods from AXPlatformNodeCocoa for testing purposes only.
 @interface AXPlatformNodeCocoa (Testing)
@@ skipping 14 matching lines @@
   void set_role(ui::AXRole role) { role_ = role; }
 
   // Add a child view and resize to fit the child.
   void FitBoundsToNewChild(View* view) {
     View::AddChildView(view);
     // Fit the parent widget to the size of the child for accurate hit tests.
     SetBoundsRect(view->bounds());
   }
 
   // View:
-  void GetAccessibleState(ui::AXViewState* state) override {
-    View::GetAccessibleState(state);
-    state->role = role_;
+  void GetAccessibleNodeData(ui::AXNodeData* node_data) override {
+    View::GetAccessibleNodeData(node_data);
+    node_data->role = role_;
   }
 
  private:
   ui::AXRole role_;
 
   DISALLOW_COPY_AND_ASSIGN(FlexibleRoleTestView);
 };
 
 class NativeWidgetMacAccessibilityTest : public test::WidgetTest {
  public:
@@ skipping 105 matching lines @@
   widget_origin = [NSValue
       valueWithPoint:gfx::ScreenPointToNSPoint(new_bounds.bottom_left())];
   EXPECT_NSEQ(widget_origin,
               AttributeValueAtMidpoint(NSAccessibilityPositionAttribute));
 }
 
 // Test for NSAccessibilityHelpAttribute.
 TEST_F(NativeWidgetMacAccessibilityTest, HelpAttribute) {
   Label* label = new Label(base::SysNSStringToUTF16(kTestPlaceholderText));
   label->SetSize(GetWidgetBounds().size());
-  EXPECT_NSEQ(nil, AttributeValueAtMidpoint(NSAccessibilityHelpAttribute));
+  EXPECT_NSEQ(@"", AttributeValueAtMidpoint(NSAccessibilityHelpAttribute));
   label->SetTooltipText(base::SysNSStringToUTF16(kTestPlaceholderText));
   widget()->GetContentsView()->AddChildView(label);
   EXPECT_NSEQ(kTestPlaceholderText,
               AttributeValueAtMidpoint(NSAccessibilityHelpAttribute));
 }
 
 // Test for NSAccessibilityWindowAttribute and
 // NSAccessibilityTopLevelUIElementAttribute.
 TEST_F(NativeWidgetMacAccessibilityTest, WindowAndTopLevelUIElementAttributes) {
   FlexibleRoleTestView* view = new FlexibleRoleTestView(ui::AX_ROLE_GROUP);
@@ skipping 189 matching lines @@
                     forAttribute:NSAccessibilitySelectedTextAttribute];
   EXPECT_NSEQ(new_string,
               AttributeValueAtMidpoint(NSAccessibilityValueAttribute));
   EXPECT_EQ(base::SysNSStringToUTF16(new_string), textfield->text());
   // Make sure the cursor is at the end of the replacement.
   EXPECT_EQ(gfx::Range(front.length() + replacement.length()),
             textfield->GetSelectedRange());
 }
 
 }  // namespace views