Refactor all accessibility code out of webkit/glue.

content/renderer/renderer_accessibility_browsertest.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/utf_string_conversions.h"
 #include "content/common/accessibility_messages.h"
+#include "content/common/accessibility_node_data.h"
 #include "content/common/view_messages.h"
 #include "content/renderer/render_view_impl.h"
 #include "content/public/test/render_view_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
-#include "webkit/glue/webaccessibility.h"
 
-using webkit_glue::WebAccessibility;
+using content::AccessibilityNodeData;
 
 class RendererAccessibilityTest : public content::RenderViewTest {
  public:
   RendererAccessibilityTest() {}
 
   RenderViewImpl* view() {
     return static_cast<RenderViewImpl*>(view_);
   }
 
   virtual void SetUp() {
@@ skipping 46 matching lines @@
   // on the document.
   {
     SCOPED_TRACE("Initial focus on document");
     AccessibilityHostMsg_NotificationParams notification;
     GetLastAccNotification(&notification);
     EXPECT_EQ(notification.notification_type,
               AccessibilityNotificationLayoutComplete);
     EXPECT_EQ(notification.includes_children, true);
     EXPECT_EQ(notification.id, 1);
     EXPECT_EQ(notification.acc_tree.id, 1);
-    EXPECT_EQ(notification.acc_tree.role, WebAccessibility::ROLE_ROOT_WEB_AREA);
+    EXPECT_EQ(notification.acc_tree.role,
+              AccessibilityNodeData::ROLE_ROOT_WEB_AREA);
     EXPECT_EQ(notification.acc_tree.state,
-              (1U << WebAccessibility::STATE_READONLY) |
-              (1U << WebAccessibility::STATE_FOCUSABLE) |
-              (1U << WebAccessibility::STATE_FOCUSED));
+              (1U << AccessibilityNodeData::STATE_READONLY) |
+              (1U << AccessibilityNodeData::STATE_FOCUSABLE) |
+              (1U << AccessibilityNodeData::STATE_FOCUSED));
     EXPECT_EQ(notification.acc_tree.children.size(), 1U);
   }
 
   // Now focus the input element, and check everything again.
   {
     SCOPED_TRACE("input");
     sink_->ClearMessages();
     ExecuteJavaScript("document.querySelector('input').focus();");
     AccessibilityHostMsg_NotificationParams notification;
     GetLastAccNotification(&notification);
     EXPECT_EQ(notification.notification_type,
               AccessibilityNotificationFocusChanged);
     EXPECT_EQ(notification.includes_children, true);
     EXPECT_EQ(notification.id, 3);
     EXPECT_EQ(notification.acc_tree.id, 1);
-    EXPECT_EQ(notification.acc_tree.role, WebAccessibility::ROLE_ROOT_WEB_AREA);
+    EXPECT_EQ(notification.acc_tree.role,
+              AccessibilityNodeData::ROLE_ROOT_WEB_AREA);
     EXPECT_EQ(notification.acc_tree.state,
-              (1U << WebAccessibility::STATE_READONLY) |
-              (1U << WebAccessibility::STATE_FOCUSABLE));
+              (1U << AccessibilityNodeData::STATE_READONLY) |
+              (1U << AccessibilityNodeData::STATE_FOCUSABLE));
     EXPECT_EQ(notification.acc_tree.children.size(), 1U);
     EXPECT_EQ(notification.acc_tree.children[0].id, 3);
     EXPECT_EQ(notification.acc_tree.children[0].role,
-              WebAccessibility::ROLE_GROUP);
+              AccessibilityNodeData::ROLE_GROUP);
     EXPECT_EQ(notification.acc_tree.children[0].state,
-              (1U << WebAccessibility::STATE_FOCUSABLE) |
-              (1U << WebAccessibility::STATE_FOCUSED));
+              (1U << AccessibilityNodeData::STATE_FOCUSABLE) |
+              (1U << AccessibilityNodeData::STATE_FOCUSED));
   }
 
   // Check other editable text nodes.
   {
     SCOPED_TRACE("textarea");
     sink_->ClearMessages();
     ExecuteJavaScript("document.querySelector('textarea').focus();");
     AccessibilityHostMsg_NotificationParams notification;
     GetLastAccNotification(&notification);
     EXPECT_EQ(notification.id, 4);
     EXPECT_EQ(notification.acc_tree.children[0].state,
-              (1U << WebAccessibility::STATE_FOCUSABLE) |
-              (1U << WebAccessibility::STATE_FOCUSED));
+              (1U << AccessibilityNodeData::STATE_FOCUSABLE) |
+              (1U << AccessibilityNodeData::STATE_FOCUSED));
   }
 
   {
     SCOPED_TRACE("contentEditable");
     sink_->ClearMessages();
     ExecuteJavaScript("document.querySelector('p').focus();");
     AccessibilityHostMsg_NotificationParams notification;
     GetLastAccNotification(&notification);
     EXPECT_EQ(notification.id, 5);
     EXPECT_EQ(notification.acc_tree.children[0].state,
-              (1U << WebAccessibility::STATE_FOCUSABLE) |
-              (1U << WebAccessibility::STATE_FOCUSED));
+              (1U << AccessibilityNodeData::STATE_FOCUSABLE) |
+              (1U << AccessibilityNodeData::STATE_FOCUSED));
   }
 
   {
     SCOPED_TRACE("role=textarea");
     sink_->ClearMessages();
     ExecuteJavaScript("document.querySelector('div').focus();");
     AccessibilityHostMsg_NotificationParams notification;
     GetLastAccNotification(&notification);
     EXPECT_EQ(notification.id, 6);
     EXPECT_EQ(notification.acc_tree.children[0].state,
-              (1U << WebAccessibility::STATE_FOCUSABLE) |
-              (1U << WebAccessibility::STATE_FOCUSED));
+              (1U << AccessibilityNodeData::STATE_FOCUSABLE) |
+              (1U << AccessibilityNodeData::STATE_FOCUSED));
   }
 
   // Try focusing things that aren't editable text.
   {
     SCOPED_TRACE("button");
     sink_->ClearMessages();
     ExecuteJavaScript("document.querySelector('button').focus();");
     AccessibilityHostMsg_NotificationParams notification;
     GetLastAccNotification(&notification);
     EXPECT_EQ(notification.id, 7);
     EXPECT_EQ(notification.acc_tree.children[0].state,
-              (1U << WebAccessibility::STATE_FOCUSABLE) |
-              (1U << WebAccessibility::STATE_FOCUSED) |
-              (1U << WebAccessibility::STATE_READONLY));
+              (1U << AccessibilityNodeData::STATE_FOCUSABLE) |
+              (1U << AccessibilityNodeData::STATE_FOCUSED) |
+              (1U << AccessibilityNodeData::STATE_READONLY));
   }
 
   {
     SCOPED_TRACE("link");
     sink_->ClearMessages();
     ExecuteJavaScript("document.querySelector('a').focus();");
     AccessibilityHostMsg_NotificationParams notification;
     GetLastAccNotification(&notification);
     EXPECT_EQ(notification.id, 8);
     EXPECT_EQ(notification.acc_tree.children[0].state,
-              (1U << WebAccessibility::STATE_FOCUSABLE) |
-              (1U << WebAccessibility::STATE_FOCUSED) |
-              (1U << WebAccessibility::STATE_READONLY));
+              (1U << AccessibilityNodeData::STATE_FOCUSABLE) |
+              (1U << AccessibilityNodeData::STATE_FOCUSED) |
+              (1U << AccessibilityNodeData::STATE_READONLY));
   }
 
   // Clear focus.
   {
     SCOPED_TRACE("Back to document.");
     sink_->ClearMessages();
     ExecuteJavaScript("document.activeElement.blur()");
     AccessibilityHostMsg_NotificationParams notification;
     GetLastAccNotification(&notification);
     EXPECT_EQ(notification.id, 1);
   }
 }