Reland 2: mac: Use a placeholder string for the family name of the system font.

LayoutTests/TestExpectations

Index: LayoutTests/TestExpectations
diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
index 9851f01591d6368b6b0430a4402112d8296f9e97..60fa2db49fce961c43da629796c9c2e30d36f8f6 100644
--- a/LayoutTests/TestExpectations
+++ b/LayoutTests/TestExpectations
@@ -1067,7 +1067,8 @@ crbug.com/509025 [ Yosemite ] css3/flexbox/repaint-opacity-change.html [ Failure
 crbug.com/509025 [ Yosemite ] css3/flexbox/repaint-rtl-column.html [ Failure ]
 crbug.com/509025 [ Yosemite ] css3/flexbox/repaint.html [ Failure ]
 crbug.com/509025 [ Yosemite ] editing/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root.html [ Failure ]
-crbug.com/509025 [ Yosemite ] fast/css/css2-system-fonts.html [ Failure ]
+# Renable this once similar override from crbug.com/515836 has been rebaselined.
+# crbug.com/509025 [ Yosemite ] fast/css/css2-system-fonts.html [ Failure ]
 crbug.com/509025 [ Yosemite ] fast/css/font-face-data-uri-invalid.html [ Failure ]
 crbug.com/509025 [ Yosemite ] fast/css/fontfaceset-download-error.html [ Failure ]
 crbug.com/509025 [ Yosemite ] fast/dom/adopt-attribute-crash.svg [ Failure ]
@@ -2261,6 +2262,15 @@ crbug.com/509025 [ Yosemite ] virtual/trustedeventsdefaultaction/fast/events/aut
 crbug.com/509025 [ Yosemite ] virtual/trustedeventsdefaultaction/fast/events/context-no-deselect.html [ Failure ]
 crbug.com/509025 [ Yosemite ] virtual/prefer_compositing_to_lcd_text/compositing/overflow/theme-affects-visual-overflow.html [ Failure ]
 
+crbug.com/515836 [ Mac ] fast/css/css2-system-fonts.html [ NeedsRebaseline ]
+crbug.com/515836 [ Mac Linux Win ] fast/forms/text-control-intrinsic-widths.html [ NeedsRebaseline ]
+crbug.com/515836 [ Yosemite ] fast/forms/select/listbox-with-display-none-option.html [ NeedsRebaseline ]
+# Renable this once similar override from crbug.com/518918 has been rebaselined.
+# crbug.com/515836 [ Yosemite ] fast/forms/select/menulist-appearance-basic.html [ NeedsRebaseline ]
+crbug.com/515836 [ Yosemite ] fast/forms/select/optgroup-rendering.html [ NeedsRebaseline ]
+crbug.com/515836 [ Yosemite ] fast/forms/input-placeholder-paint-order.html [ NeedsRebaseline ]
+crbug.com/515836 [ Yosemite ] fast/forms/textarea/textarea-placeholder-paint-order.html [ NeedsRebaseline ]
+
 # GrGLConvolutionEffect optimization causes blink layout test image differences
 crbug.com/505086 css3/filters/effect-blur-hw.html [ NeedsManualRebaseline ]
 crbug.com/505086 css3/filters/effect-brightness-clamping-hw.html [ NeedsManualRebaseline ]