Move two BrowserAccessibility role predicates to ax_role_properties.

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"
@@ skipping 235 matching lines @@
 }
 
 bool AccessibilityComboboxPredicate(
     BrowserAccessibility* start, BrowserAccessibility* node) {
   return (node->GetRole() == ui::AX_ROLE_COMBO_BOX ||
           node->GetRole() == ui::AX_ROLE_POP_UP_BUTTON);
 }
 
 bool AccessibilityControlPredicate(
     BrowserAccessibility* start, BrowserAccessibility* node) {
-  if (node->IsControl())
+  if (ui::IsControl(node->GetRole()))
     return true;
   if (node->HasState(ui::AX_STATE_FOCUSABLE) &&
       node->GetRole() != ui::AX_ROLE_IFRAME &&
       node->GetRole() != ui::AX_ROLE_IFRAME_PRESENTATIONAL &&
       node->GetRole() != ui::AX_ROLE_IMAGE_MAP_LINK &&
       node->GetRole() != ui::AX_ROLE_LINK &&
       node->GetRole() != ui::AX_ROLE_WEB_AREA &&
       node->GetRole() != ui::AX_ROLE_ROOT_WEB_AREA) {
     return true;
   }
@@ skipping 182 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