  extern "C" {
  void CGSSetDenyWindowServerConnections(bool);
  void CGSShutdownServerConnections();
-@@ -56,6 +57,7 @@ int sandbox_apply(void* profile);
+@@ -56,6 +57,7 @@
  void sandbox_free_params(void* params);
  void sandbox_free_profile(void* profile);
  };

diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm
index 947575e..c577069b 100644
--- a/content/browser/accessibility/browser_accessibility_cocoa.mm
+++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
@@ -84,10 +84,12 @@ const int kAXResultsLimitNoLimit = -1;
 
 extern "C" {
 
+#ifndef MAS_BUILD
 // See http://openradar.appspot.com/9896491. This SPI has been tested on 10.5,
 // 10.6, and 10.7. It allows accessibility clients to observe events posted on
 // this object.
 void NSAccessibilityUnregisterUniqueIdForUIElement(id element);
+#endif
 
 // The following are private accessibility APIs required for cursor navigation
 // and text selection. VoiceOver started relying on them in Mac OS X 10.11.
@@ -490,7 +492,9 @@ bool InitializeAccessibilityTreeSearch(
 
 - (void)detach {
   if (browserAccessibility_) {

     browserAccessibility_ = NULL;
   }
 }
@@ -740,6 +750,7 @@ - (NSNumber*)enabled {
       GetState(browserAccessibility_, ui::AX_STATE_ENABLED)];
 }
 
+#ifndef MAS_BUILD
 // Returns a text marker that points to the last character in the document that
 // can be selected with VoiceOver.
 - (id)endTextMarker {
@@ -767,6 +778,7 @@ - (id)endTextMarker {
   return CreateTextMarker(*last_text_object,
                           last_text_object->GetText().length());
 }
+#endif
 
 - (NSNumber*)expanded {
   return [NSNumber numberWithBool:
@@ -1280,6 +1292,7 @@ - (NSArray*)selectedChildren {
   return ret;
 }
 
+#ifndef MAS_BUILD
 - (id)selectedTextMarkerRange {
   if (!browserAccessibility_)
     return nil;
@@ -1306,6 +1319,7 @@ - (id)selectedTextMarkerRange {
   return CreateTextMarkerRange(*anchorObject, anchorOffset, *focusObject,
                                focusOffset);
 }
+#endif
 
 - (NSValue*)size {
   gfx::Rect bounds = browserAccessibility_->GetLocalBoundsRect();
@@ -1337,6 +1351,7 @@ - (NSString*)sortDirection {
   return nil;
 }
 
+#ifndef MAS_BUILD
 // Returns a text marker that points to the first character in the document that
 // can be selected with VoiceOver.
 - (id)startTextMarker {
@@ -1363,6 +1378,7 @@ - (id)startTextMarker {
 
   return CreateTextMarker(*first_text_object, 0);
 }
+#endif
 
 // Returns a subrole based upon the role.
 - (NSString*) subrole {
@@ -1745,6 +1761,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
     return nil;
   }
 
+#ifndef MAS_BUILD
   if ([attribute isEqualToString:@"AXUIElementForTextMarker"]) {
     BrowserAccessibility* object;
     int offset;
@@ -1834,6 +1851,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
     NSString* text = GetTextForTextMarkerRange(parameter);
     return [NSNumber numberWithInt:[text length]];
   }
+#endif
 
   if ([attribute isEqualToString:
       NSAccessibilityBoundsForRangeParameterizedAttribute]) {
diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm
index 712de43..36a954a 100644
--- a/content/browser/accessibility/browser_accessibility_manager_mac.mm
+++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm
@@ -69,8 +69,10 @@
     @"AXTextSelectionGranularity";
 NSString* const NSAccessibilityTextSelectionChangedFocus =
     @"AXTextSelectionChangedFocus";
+#ifndef MAS_BUILD
 NSString* const NSAccessibilitySelectedTextMarkerRangeAttribute =
     @"AXSelectedTextMarkerRange";
+#endif
 NSString* const NSAccessibilityTextChangeElement = @"AXTextChangeElement";
 
 }  // namespace
@@ -320,8 +322,10 @@
     focus_object = focus_object->GetClosestPlatformObject();
     auto native_focus_object = focus_object->ToBrowserAccessibilityCocoa();
     if (native_focus_object) {
+#ifndef MAS_BUILD
       [user_info setObject:[native_focus_object selectedTextMarkerRange]
                     forKey:NSAccessibilitySelectedTextMarkerRangeAttribute];
+#endif
       [user_info setObject:native_focus_object
                     forKey:NSAccessibilityTextChangeElement];
     }
diff --git a/content/common/sandbox_mac.mm b/content/common/sandbox_mac.mm
index ca915a7..b6b23a2 100644
--- a/content/common/sandbox_mac.mm
+++ b/content/common/sandbox_mac.mm
@@ -43,6 +43,7 @@
 #include "ui/base/layout.h"
 #include "ui/gl/gl_surface.h"
 
