Make use of new AX name calc in Chromium.

content/browser/accessibility/browser_accessibility_mac_unittest.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 <Cocoa/Cocoa.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/accessibility/browser_accessibility_cocoa.h"
@@ skipping 12 matching lines @@
     RebuildAccessibilityTree();
   }
 
  protected:
   void RebuildAccessibilityTree() {
     ui::AXNodeData root;
     root.id = 1000;
     root.location.set_width(500);
     root.location.set_height(100);
     root.role = ui::AX_ROLE_ROOT_WEB_AREA;
-    root.AddStringAttribute(ui::AX_ATTR_HELP, "HelpText");
+    root.AddStringAttribute(ui::AX_ATTR_DESCRIPTION, "HelpText");
     root.child_ids.push_back(1001);
     root.child_ids.push_back(1002);
 
     ui::AXNodeData child1;
     child1.id = 1001;
     child1.SetName("Child1");
     child1.location.set_width(250);
     child1.location.set_height(100);
     child1.role = ui::AX_ROLE_BUTTON;
 
@@ skipping 15 matching lines @@
 
   base::scoped_nsobject<BrowserAccessibilityCocoa> accessibility_;
   scoped_ptr<BrowserAccessibilityManager> manager_;
 };
 
 // Standard hit test.
 TEST_F(BrowserAccessibilityTest, HitTestTest) {
   BrowserAccessibilityCocoa* firstChild =
       [accessibility_ accessibilityHitTest:NSMakePoint(50, 50)];
   EXPECT_NSEQ(@"Child1",
-      [firstChild accessibilityAttributeValue:NSAccessibilityTitleAttribute]);
+      [firstChild
+       accessibilityAttributeValue:NSAccessibilityDescriptionAttribute]);
 }
 
 // Test doing a hit test on the edge of a child.
 TEST_F(BrowserAccessibilityTest, EdgeHitTest) {
   BrowserAccessibilityCocoa* firstChild =
       [accessibility_ accessibilityHitTest:NSZeroPoint];
   EXPECT_NSEQ(@"Child1",
-      [firstChild accessibilityAttributeValue:NSAccessibilityTitleAttribute]);
+      [firstChild
+       accessibilityAttributeValue:NSAccessibilityDescriptionAttribute]);
 }
 
 // This will test a hit test with invalid coordinates.  It is assumed that
 // the hit test has been narrowed down to this object or one of its children
 // so it should return itself since it has no better hit result.
 TEST_F(BrowserAccessibilityTest, InvalidHitTestCoordsTest) {
   BrowserAccessibilityCocoa* hitTestResult =
       [accessibility_ accessibilityHitTest:NSMakePoint(-50, 50)];
   EXPECT_NSEQ(accessibility_, hitTestResult);
 }
@@ skipping 10 matching lines @@
   NSString* shouldBeNil = [accessibility_
       accessibilityAttributeValue:@"NSAnInvalidAttribute"];
   EXPECT_TRUE(shouldBeNil == nil);
 }
 
 TEST_F(BrowserAccessibilityTest, RetainedDetachedObjectsReturnNil) {
   // Get the first child.
   BrowserAccessibilityCocoa* retainedFirstChild =
       [accessibility_ accessibilityHitTest:NSMakePoint(50, 50)];
   EXPECT_NSEQ(@"Child1", [retainedFirstChild
-      accessibilityAttributeValue:NSAccessibilityTitleAttribute]);
+      accessibilityAttributeValue:NSAccessibilityDescriptionAttribute]);
 
   // Retain it. This simulates what the system might do with an
   // accessibility object.
   [retainedFirstChild retain];
 
   // Rebuild the accessibility tree, which should detach |retainedFirstChild|.
   RebuildAccessibilityTree();
 
   // Now any attributes we query should return nil.
   EXPECT_EQ(nil, [retainedFirstChild
-      accessibilityAttributeValue:NSAccessibilityTitleAttribute]);
+      accessibilityAttributeValue:NSAccessibilityDescriptionAttribute]);
 
   // Don't leak memory in the test.
   [retainedFirstChild release];
 }
 
 }  // namespace content