Use Blink accessibility enums in Chromium

content/browser/accessibility/browser_accessibility_manager_unittest.cc

 // Copyright (c) 2012 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/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/accessibility/browser_accessibility.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/common/accessibility_messages.h"
 #include "content/common/accessibility_node_data.h"

[aboxhall, 2013/08/29 00:59:06]

Remove?

[dmazzoni, 2013/08/29 04:47:15]

No, it's used.

 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 namespace {
 
 // Subclass of BrowserAccessibility that counts the number of instances.
 class CountedBrowserAccessibility : public BrowserAccessibility {
  public:
   CountedBrowserAccessibility() {
     global_obj_count_++;
@@ skipping 65 matching lines @@
 
 }  // anonymous namespace
 
 TEST(BrowserAccessibilityManagerTest, TestNoLeaks) {
   // Create AccessibilityNodeData objects for a simple document tree,
   // representing the accessibility information used to initialize
   // BrowserAccessibilityManager.
   AccessibilityNodeData button;
   button.id = 2;
   button.SetName("Button");
-  button.role = AccessibilityNodeData::ROLE_BUTTON;
+  button.role = WebKit::WebAXRoleButton;
   button.state = 0;
 
   AccessibilityNodeData checkbox;
   checkbox.id = 3;
   checkbox.SetName("Checkbox");
-  checkbox.role = AccessibilityNodeData::ROLE_CHECKBOX;
+  checkbox.role = WebKit::WebAXRoleCheckBox;
   checkbox.state = 0;
 
   AccessibilityNodeData root;
   root.id = 1;
   root.SetName("Document");
-  root.role = AccessibilityNodeData::ROLE_ROOT_WEB_AREA;
+  root.role = WebKit::WebAXRoleRootWebArea;
   root.state = 0;
   root.child_ids.push_back(2);
   root.child_ids.push_back(3);
 
   // Construct a BrowserAccessibilityManager with this
   // AccessibilityNodeData tree and a factory for an instance-counting
   // BrowserAccessibility, and ensure that exactly 3 instances were
   // created. Note that the manager takes ownership of the factory.
   CountedBrowserAccessibility::global_obj_count_ = 0;
   BrowserAccessibilityManager* manager =
@@ skipping 45 matching lines @@
   // Tree 1:
   //
   // root
   //   child1
   //   child2
   //   child3
 
   AccessibilityNodeData tree1_child1;
   tree1_child1.id = 2;
   tree1_child1.SetName("Child1");
-  tree1_child1.role = AccessibilityNodeData::ROLE_BUTTON;
+  tree1_child1.role = WebKit::WebAXRoleButton;
   tree1_child1.state = 0;
 
   AccessibilityNodeData tree1_child2;
   tree1_child2.id = 3;
   tree1_child2.SetName("Child2");
-  tree1_child2.role = AccessibilityNodeData::ROLE_BUTTON;
+  tree1_child2.role = WebKit::WebAXRoleButton;
   tree1_child2.state = 0;
 
   AccessibilityNodeData tree1_child3;
   tree1_child3.id = 4;
   tree1_child3.SetName("Child3");
-  tree1_child3.role = AccessibilityNodeData::ROLE_BUTTON;
+  tree1_child3.role = WebKit::WebAXRoleButton;
   tree1_child3.state = 0;
 
   AccessibilityNodeData tree1_root;
   tree1_root.id = 1;
   tree1_root.SetName("Document");
-  tree1_root.role = AccessibilityNodeData::ROLE_ROOT_WEB_AREA;
+  tree1_root.role = WebKit::WebAXRoleRootWebArea;
   tree1_root.state = 0;
   tree1_root.child_ids.push_back(2);
   tree1_root.child_ids.push_back(3);
   tree1_root.child_ids.push_back(4);
 
   // Tree 2:
   //
   // root
   //   child0  <-- inserted
   //   child1
   //   child2
   //           <-- child3 deleted
 
   AccessibilityNodeData tree2_child0;
   tree2_child0.id = 5;
   tree2_child0.SetName("Child0");
-  tree2_child0.role = AccessibilityNodeData::ROLE_BUTTON;
+  tree2_child0.role = WebKit::WebAXRoleButton;
   tree2_child0.state = 0;
 
   AccessibilityNodeData tree2_root;
   tree2_root.id = 1;
   tree2_root.SetName("DocumentChanged");
-  tree2_root.role = AccessibilityNodeData::ROLE_ROOT_WEB_AREA;
+  tree2_root.role = WebKit::WebAXRoleRootWebArea;
   tree2_root.state = 0;
   tree2_root.child_ids.push_back(5);
   tree2_root.child_ids.push_back(2);
   tree2_root.child_ids.push_back(3);
 
   // Construct a BrowserAccessibilityManager with tree1.
   CountedBrowserAccessibility::global_obj_count_ = 0;
   BrowserAccessibilityManager* manager =
       BrowserAccessibilityManager::Create(
           tree1_root,
@@ skipping 15 matching lines @@
   CountedBrowserAccessibility* child3_accessible =
       static_cast<CountedBrowserAccessibility*>(root_accessible->GetChild(2));
   child3_accessible->NativeAddReference();
 
   // Check the index in parent.
   EXPECT_EQ(0, child1_accessible->index_in_parent());
   EXPECT_EQ(1, child2_accessible->index_in_parent());
   EXPECT_EQ(2, child3_accessible->index_in_parent());
 
   // Process a notification containing the changed subtree.
-  std::vector<AccessibilityHostMsg_NotificationParams> params;
-  params.push_back(AccessibilityHostMsg_NotificationParams());
-  AccessibilityHostMsg_NotificationParams* msg = &params[0];
-  msg->notification_type = AccessibilityNotificationChildrenChanged;
+  std::vector<AccessibilityHostMsg_EventParams> params;
+  params.push_back(AccessibilityHostMsg_EventParams());
+  AccessibilityHostMsg_EventParams* msg = &params[0];
+  msg->event_type = WebKit::WebAXEventChildrenChanged;
   msg->nodes.push_back(tree2_root);
   msg->nodes.push_back(tree2_child0);
   msg->id = tree2_root.id;
-  manager->OnAccessibilityNotifications(params);
+  manager->OnAccessibilityEvents(params);
 
   // There should be 5 objects now: the 4 from the new tree, plus the
   // reference to child3 we kept.
   EXPECT_EQ(5, CountedBrowserAccessibility::global_obj_count_);
 
   // Check that our references to the root, child1, and child2 are still valid,
   // but that the reference to child3 is now invalid.
   EXPECT_TRUE(root_accessible->instance_active());
   EXPECT_TRUE(child1_accessible->instance_active());
   EXPECT_TRUE(child2_accessible->instance_active());
@@ skipping 27 matching lines @@
   //     child1
   //       grandchild1
   //     child2
   //       grandchild2
   //     child3
   //       grandchild3
 
   AccessibilityNodeData tree1_grandchild1;
   tree1_grandchild1.id = 4;
   tree1_grandchild1.SetName("GrandChild1");
-  tree1_grandchild1.role = AccessibilityNodeData::ROLE_BUTTON;
+  tree1_grandchild1.role = WebKit::WebAXRoleButton;
   tree1_grandchild1.state = 0;
 
   AccessibilityNodeData tree1_child1;
   tree1_child1.id = 3;
   tree1_child1.SetName("Child1");
-  tree1_child1.role = AccessibilityNodeData::ROLE_BUTTON;
+  tree1_child1.role = WebKit::WebAXRoleButton;
   tree1_child1.state = 0;
   tree1_child1.child_ids.push_back(4);
 
   AccessibilityNodeData tree1_grandchild2;
   tree1_grandchild2.id = 6;
   tree1_grandchild2.SetName("GrandChild1");
-  tree1_grandchild2.role = AccessibilityNodeData::ROLE_BUTTON;
+  tree1_grandchild2.role = WebKit::WebAXRoleButton;
   tree1_grandchild2.state = 0;
 
   AccessibilityNodeData tree1_child2;
   tree1_child2.id = 5;
   tree1_child2.SetName("Child2");
-  tree1_child2.role = AccessibilityNodeData::ROLE_BUTTON;
+  tree1_child2.role = WebKit::WebAXRoleButton;
   tree1_child2.state = 0;
   tree1_child2.child_ids.push_back(6);
 
   AccessibilityNodeData tree1_grandchild3;
   tree1_grandchild3.id = 8;
   tree1_grandchild3.SetName("GrandChild3");
-  tree1_grandchild3.role = AccessibilityNodeData::ROLE_BUTTON;
+  tree1_grandchild3.role = WebKit::WebAXRoleButton;
   tree1_grandchild3.state = 0;
 
   AccessibilityNodeData tree1_child3;
   tree1_child3.id = 7;
   tree1_child3.SetName("Child3");
-  tree1_child3.role = AccessibilityNodeData::ROLE_BUTTON;
+  tree1_child3.role = WebKit::WebAXRoleButton;
   tree1_child3.state = 0;
   tree1_child3.child_ids.push_back(8);
 
   AccessibilityNodeData tree1_container;
   tree1_container.id = 2;
   tree1_container.SetName("Container");
-  tree1_container.role = AccessibilityNodeData::ROLE_GROUP;
+  tree1_container.role = WebKit::WebAXRoleGroup;
   tree1_container.state = 0;
   tree1_container.child_ids.push_back(3);
   tree1_container.child_ids.push_back(5);
   tree1_container.child_ids.push_back(7);
 
   AccessibilityNodeData tree1_root;
   tree1_root.id = 1;
   tree1_root.SetName("Document");
-  tree1_root.role = AccessibilityNodeData::ROLE_ROOT_WEB_AREA;
+  tree1_root.role = WebKit::WebAXRoleRootWebArea;
   tree1_root.state = 0;
   tree1_root.child_ids.push_back(2);
 
   // Tree 2:
   //
   // root
   //   container
   //     child0         <-- inserted
   //       grandchild0  <--
   //     child1
   //       grandchild1
   //     child2
   //       grandchild2
   //                    <-- child3 (and grandchild3) deleted
 
   AccessibilityNodeData tree2_grandchild0;
   tree2_grandchild0.id = 9;
   tree2_grandchild0.SetName("GrandChild0");
-  tree2_grandchild0.role = AccessibilityNodeData::ROLE_BUTTON;
+  tree2_grandchild0.role = WebKit::WebAXRoleButton;
   tree2_grandchild0.state = 0;
 
   AccessibilityNodeData tree2_child0;
   tree2_child0.id = 10;
   tree2_child0.SetName("Child0");
-  tree2_child0.role = AccessibilityNodeData::ROLE_BUTTON;
+  tree2_child0.role = WebKit::WebAXRoleButton;
   tree2_child0.state = 0;
   tree2_child0.child_ids.push_back(9);
 
   AccessibilityNodeData tree2_container;
   tree2_container.id = 2;
   tree2_container.SetName("Container");
-  tree2_container.role = AccessibilityNodeData::ROLE_GROUP;
+  tree2_container.role = WebKit::WebAXRoleGroup;
   tree2_container.state = 0;
   tree2_container.child_ids.push_back(10);
   tree2_container.child_ids.push_back(3);
   tree2_container.child_ids.push_back(5);
 
   // Construct a BrowserAccessibilityManager with tree1.
   CountedBrowserAccessibility::global_obj_count_ = 0;
   BrowserAccessibilityManager* manager =
       BrowserAccessibilityManager::Create(
           tree1_root,
@@ skipping 20 matching lines @@
       static_cast<CountedBrowserAccessibility*>(
           container_accessible->GetChild(2));
   child3_accessible->NativeAddReference();
 
   // Check the index in parent.
   EXPECT_EQ(1, child2_accessible->index_in_parent());
   EXPECT_EQ(2, child3_accessible->index_in_parent());
 
   // Process a notification containing the changed subtree rooted at
   // the container.
-  std::vector<AccessibilityHostMsg_NotificationParams> params;
-  params.push_back(AccessibilityHostMsg_NotificationParams());
-  AccessibilityHostMsg_NotificationParams* msg = &params[0];
-  msg->notification_type = AccessibilityNotificationChildrenChanged;
+  std::vector<AccessibilityHostMsg_EventParams> params;
+  params.push_back(AccessibilityHostMsg_EventParams());
+  AccessibilityHostMsg_EventParams* msg = &params[0];
+  msg->event_type = WebKit::WebAXEventChildrenChanged;
   msg->nodes.push_back(tree2_container);
   msg->nodes.push_back(tree2_child0);
   msg->nodes.push_back(tree2_grandchild0);
   msg->id = tree2_container.id;
-  manager->OnAccessibilityNotifications(params);
+  manager->OnAccessibilityEvents(params);
 
   // There should be 9 objects now: the 8 from the new tree, plus the
   // reference to child3 we kept.
   EXPECT_EQ(9, CountedBrowserAccessibility::global_obj_count_);
 
   // Check that our references to the root and container and child2 are
   // still valid, but that the reference to child3 is now invalid.
   EXPECT_TRUE(root_accessible->instance_active());
   EXPECT_TRUE(container_accessible->instance_active());
   EXPECT_TRUE(child2_accessible->instance_active());
@@ skipping 36 matching lines @@
   tree1_3.id = 3;
   tree1_3.state = 0;
   tree1_3.child_ids.push_back(4);
 
   AccessibilityNodeData tree1_2;
   tree1_2.id = 2;
   tree1_2.state = 0;
 
   AccessibilityNodeData tree1_1;
   tree1_1.id = 1;
-  tree1_1.role = AccessibilityNodeData::ROLE_ROOT_WEB_AREA;
+  tree1_1.role = WebKit::WebAXRoleRootWebArea;
   tree1_1.state = 0;
   tree1_1.child_ids.push_back(2);
   tree1_1.child_ids.push_back(3);
 
   // Tree 2:
   //
   // 1
   //   4    <-- moves up a level and gains child
   //     6  <-- new
   //   5    <-- new
@@ skipping 21 matching lines @@
   CountedBrowserAccessibility::global_obj_count_ = 0;
   BrowserAccessibilityManager* manager =
       BrowserAccessibilityManager::Create(
           tree1_1,
           NULL,
           new CountedBrowserAccessibilityFactory());
   manager->UpdateNodesForTesting(tree1_2, tree1_3, tree1_4);
   ASSERT_EQ(4, CountedBrowserAccessibility::global_obj_count_);
 
   // Process a notification containing the changed subtree.
-  std::vector<AccessibilityHostMsg_NotificationParams> params;
-  params.push_back(AccessibilityHostMsg_NotificationParams());
-  AccessibilityHostMsg_NotificationParams* msg = &params[0];
-  msg->notification_type = AccessibilityNotificationChildrenChanged;
+  std::vector<AccessibilityHostMsg_EventParams> params;
+  params.push_back(AccessibilityHostMsg_EventParams());
+  AccessibilityHostMsg_EventParams* msg = &params[0];
+  msg->event_type = WebKit::WebAXEventChildrenChanged;
   msg->nodes.push_back(tree2_1);
   msg->nodes.push_back(tree2_4);
   msg->nodes.push_back(tree2_5);
   msg->nodes.push_back(tree2_6);
   msg->id = tree2_1.id;
-  manager->OnAccessibilityNotifications(params);
+  manager->OnAccessibilityEvents(params);
 
   // There should be 4 objects now.
   EXPECT_EQ(4, CountedBrowserAccessibility::global_obj_count_);
 
   // Delete the manager and make sure all memory is cleaned up.
   delete manager;
   ASSERT_EQ(0, CountedBrowserAccessibility::global_obj_count_);
 }
 
 TEST(BrowserAccessibilityManagerTest, TestFatalError) {
   // Test that BrowserAccessibilityManager raises a fatal error
   // (which will crash the renderer) if the same id is used in
   // two places in the tree.
 
   AccessibilityNodeData root;
   root.id = 1;
-  root.role = AccessibilityNodeData::ROLE_ROOT_WEB_AREA;
+  root.role = WebKit::WebAXRoleRootWebArea;
   root.child_ids.push_back(2);
   root.child_ids.push_back(2);
 
   CountedBrowserAccessibilityFactory* factory =
       new CountedBrowserAccessibilityFactory();
   scoped_ptr<TestBrowserAccessibilityDelegate> delegate(
       new TestBrowserAccessibilityDelegate());
   scoped_ptr<BrowserAccessibilityManager> manager;
   ASSERT_FALSE(delegate->got_fatal_error());
   manager.reset(BrowserAccessibilityManager::Create(
       root,
       delegate.get(),
       factory));
   ASSERT_TRUE(delegate->got_fatal_error());
 
   AccessibilityNodeData root2;
   root2.id = 1;
-  root2.role = AccessibilityNodeData::ROLE_ROOT_WEB_AREA;
+  root2.role = WebKit::WebAXRoleRootWebArea;
   root2.child_ids.push_back(2);
   root2.child_ids.push_back(3);
 
   AccessibilityNodeData child1;
   child1.id = 2;
   child1.child_ids.push_back(4);
   child1.child_ids.push_back(5);
 
   AccessibilityNodeData child2;
   child2.id = 3;
   child2.child_ids.push_back(6);
   child2.child_ids.push_back(5);  // Duplicate
 
   delegate->reset_got_fatal_error();
   factory = new CountedBrowserAccessibilityFactory();
   manager.reset(BrowserAccessibilityManager::Create(
       root2,
       delegate.get(),
       factory));
   ASSERT_FALSE(delegate->got_fatal_error());
   manager->UpdateNodesForTesting(child1, child2);
   ASSERT_TRUE(delegate->got_fatal_error());
 }
 
 }  // namespace content