Move two BrowserAccessibility role predicates to ax_role_properties.

content/browser/accessibility/browser_accessibility_cocoa.mm

 // 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.
 
 #import "content/browser/accessibility/browser_accessibility_cocoa.h"
 
 #include <execinfo.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
@@ skipping 864 matching lines @@
       std::string basename =
           leftIndex != std::string::npos ? url.substr(leftIndex) : url;
       return base::SysUTF8ToNSString(basename);
     }
   }
 
   // If it's focusable but didn't have any other name or value, compute a name
   // from its descendants.
   base::string16 value = browserAccessibility_->GetValue();
   if (browserAccessibility_->HasState(ui::AX_STATE_FOCUSABLE) &&
-      !browserAccessibility_->IsControl() &&
-      value.empty() &&
+      !IsControl(browserAccessibility_->GetRole()) && value.empty() &&
       [self internalRole] != ui::AX_ROLE_DATE_TIME &&
       [self internalRole] != ui::AX_ROLE_WEB_AREA &&
       [self internalRole] != ui::AX_ROLE_ROOT_WEB_AREA) {
     return base::SysUTF8ToNSString(
         browserAccessibility_->ComputeAccessibleNameFromDescendants());
   }
 
   return @"";
 }
 
@@ skipping 399 matching lines @@
   }
 }
 
 // Returns true if this object should expose its accessible name using
 // AXTitleUIElement rather than AXTitle or AXDescription. We only do
 // this if it's a control, if there's a single label, and the label has
 // nonempty text.
 // internal
 - (BOOL)shouldExposeTitleUIElement {
   // VoiceOver ignores TitleUIElement if the element isn't a control.
-  if (!browserAccessibility_->IsControl())
+  if (!IsControl(browserAccessibility_->GetRole()))
     return false;
 
   ui::AXNameFrom nameFrom = static_cast<ui::AXNameFrom>(
       browserAccessibility_->GetIntAttribute(ui::AX_ATTR_NAME_FROM));
   if (nameFrom != ui::AX_NAME_FROM_RELATED_ELEMENT)
     return false;
 
   std::vector<int32_t> labelledby_ids =
   browserAccessibility_->GetIntListAttribute(ui::AX_ATTR_LABELLEDBY_IDS);
   if (labelledby_ids.size() != 1)
@@ skipping 1182 matching lines @@
     return nil;
 
   NSMutableArray* actions = [NSMutableArray
       arrayWithObjects:NSAccessibilityShowMenuAction,
                        NSAccessibilityScrollToVisibleAction, nil];
 
   // VoiceOver expects the "press" action to be first.
   if (browserAccessibility_->IsClickable())
     [actions insertObject:NSAccessibilityPressAction atIndex:0];
 
-  if (browserAccessibility_->IsMenuRelated())
+  if (IsMenuRelated(browserAccessibility_->GetRole()))
     [actions addObject:NSAccessibilityCancelAction];
 
   if ([self internalRole] == ui::AX_ROLE_SLIDER) {
     [actions addObjectsFromArray:@[
       NSAccessibilityIncrementAction, NSAccessibilityDecrementAction
     ]];
   }
 
   return actions;
 }
@@ skipping 363 matching lines @@
 }
 
 - (BOOL)accessibilityNotifiesWhenDestroyed {
   // Indicate that BrowserAccessibilityCocoa will post a notification when it's
   // destroyed (see -detach). This allows VoiceOver to do some internal things
   // more efficiently.
   return YES;
 }
 
 @end