  
  // Returns a subrole based upon the role.
  - (NSString*) subrole {
-@@ -2024,10 +2038,12 @@ NSString* const NSAccessibilityRequiredAttribute = @"AXRequired";
-   NSString* value = base::SysUTF16ToNSString(browserAccessibility_->GetValue());
+@@ -2112,12 +2112,14 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
    NSMutableAttributedString* attributedValue =
        [[[NSMutableAttributedString alloc] initWithString:value] autorelease];
-+#ifndef MAS_BUILD
-   std::vector<const BrowserAccessibility*> textOnlyObjects =
-       BrowserAccessibilityManager::FindTextOnlyObjectsInRange(
-           *browserAccessibility_, *browserAccessibility_);
-   AddMisspelledTextAttributes(textOnlyObjects, attributedValue);
-+#endif
+ 
++#ifndef MAS_BUILD
+   if (!browserAccessibility_->IsTextOnlyObject()) {
+     std::vector<const BrowserAccessibility*> textOnlyObjects =
+         BrowserAccessibilityManager::FindTextOnlyObjectsInRange(
+             *browserAccessibility_, *browserAccessibility_);
+     AddMisspelledTextAttributes(textOnlyObjects, attributedValue);
+   }
++#endif
+ 
    return [attributedValue attributedSubstringFromRange:range];
  }
- 
 @@ -2147,6 +2163,7 @@ NSString* const NSAccessibilityRequiredAttribute = @"AXRequired";
      return nil;
    }

 extern "C" {
 void CGSSetDenyWindowServerConnections(bool);
 void CGSShutdownServerConnections();
 OSStatus SetApplicationIsDaemon(Boolean isDaemon);
 };
+#endif
 
 namespace content {
 
@@ -306,6 +308,7 @@ void Sandbox::SandboxWarmup(int sandbox_type) {
 // This disconnects from the window server, and then indicates that Chrome
 // should continue execution without access to launchservicesd.
 void DisconnectWindowServer() {

 
 // Returns an autoreleased copy of the AXNodeData's attribute.
 NSString* NSStringForStringAttribute(
@@ -574,7 +574,9 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
       {NSAccessibilityDOMIdentifierAttribute, @"domIdentifier"},
       {NSAccessibilityEditableAncestorAttribute, @"editableAncestor"},
       {NSAccessibilityEnabledAttribute, @"enabled"},
+#ifndef MAS_BUILD
       {NSAccessibilityEndTextMarkerAttribute, @"endTextMarker"},
