Move AX Role predicates into ax_role_properties.h.

content/browser/accessibility/one_shot_accessibility_tree_search.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 "content/browser/accessibility/one_shot_accessibility_tree_search.h"
 
 #include <stdint.h>
 
 #include "base/i18n/case_conversion.h"
 #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 "ui/accessibility/ax_enums.h"
+#include "ui/accessibility/ax_role_properties.h"
 
 namespace content {
 
 // Given a node, populate a vector with all of the strings from that node's
 // attributes that might be relevant for a text search.
 void GetNodeStrings(BrowserAccessibility* node,
                     std::vector<base::string16>* strings) {
   if (node->HasStringAttribute(ui::AX_ATTR_NAME))
     strings->push_back(node->GetString16Attribute(ui::AX_ATTR_NAME));
   if (node->HasStringAttribute(ui::AX_ATTR_DESCRIPTION))
@@ skipping 377 matching lines @@
           node->GetRole() == ui::AX_ROLE_MENU_ITEM_RADIO);
 }
 
 bool AccessibilityRadioGroupPredicate(
     BrowserAccessibility* start, BrowserAccessibility* node) {
   return node->GetRole() == ui::AX_ROLE_RADIO_GROUP;
 }
 
 bool AccessibilityTablePredicate(
     BrowserAccessibility* start, BrowserAccessibility* node) {
-  return node->IsTableLikeRole();
+  return ui::IsTableLikeRole(node->GetRole());
 }
 
 bool AccessibilityTextfieldPredicate(
     BrowserAccessibility* start, BrowserAccessibility* node) {
   return (node->IsSimpleTextControl() || node->IsRichTextControl());
 }
 
 bool AccessibilityTextStyleBoldPredicate(
     BrowserAccessibility* start, BrowserAccessibility* node) {
   int32_t style = node->GetIntAttribute(ui::AX_ATTR_TEXT_STYLE);
@@ skipping 25 matching lines @@
 }
 
 bool AccessibilityVisitedLinkPredicate(
     BrowserAccessibility* start, BrowserAccessibility* node) {
   return ((node->GetRole() == ui::AX_ROLE_LINK ||
            node->GetRole() == ui::AX_ROLE_IMAGE_MAP_LINK) &&
           node->HasState(ui::AX_STATE_VISITED));
 }
 
 }  // namespace content