Refactor OS X sandbox processing and audit sandbox files

content/renderer/renderer.sb

Index: content/renderer/renderer.sb
diff --git a/content/renderer/renderer.sb b/content/renderer/renderer.sb
index 184f5936571c578ec929ba623170b80c62a6b5c9..5237c32e496e1553bf350ae070055abd6a44e1a0 100644
--- a/content/renderer/renderer.sb
+++ b/content/renderer/renderer.sb
@@ -7,22 +7,20 @@
 ; *** The contents of content/common/common.sb are implicitly included here. ***
 
 ; Needed for Fonts.
-(allow file-read* (regex #"^/System/Library/Fonts($|/)"))  ; 10.5.6
+(allow file-read* (regex #"^/System/Library/Fonts($|/)"))
 ; 10.6 for loading fonts in the renderer.
-; on 10.5 this is needed for the PDF plugin.
 (allow file-read* (regex #"^/Library/Fonts($|/)"))
-(allow mach-lookup (global-name "com.apple.FontObjectsServer"))  ; 10.5.6
 (allow mach-lookup (global-name "com.apple.FontServer"))  ; 10.6
 
 (allow file-read*
-  (regex #"^/System/Library/ColorSync($|/)")  ; 10.5.6 - http://crbug.com/46648
+  (regex #"^/System/Library/ColorSync($|/)")  ; http://crbug.com/46648
   (regex #"^/System/Library/Keyboard Layouts($|/)")  ; http://crbug.com/152566
   (literal "/Library/Preferences/.GlobalPreferences.plist") ; http://crbug.com/60917
-  (literal "@USER_HOMEDIR_AS_LITERAL@/Library/Preferences/.GlobalPreferences.plist")
+  (literal (string-append (param homedir-as-literal) "/Library/Preferences/.GlobalPreferences.plist"))
 )
 
 ; http://crbug.com/11269
-(allow file-read* (subpath "@USER_HOMEDIR_AS_LITERAL@/Library/Fonts"))  ; 10.6
+(allow file-read* (subpath (string-append (param homedir-as-literal) "/Library/Fonts")))  ; 10.6
 
 ; http://crbug.com/60917
 (allow file-read-metadata