Further cleanup of OS_MACOSX in cc

Bug: 1105907
Change-Id: I32836d2d1bfa0854f32930f0af7f98b1d46118f8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2328332
Auto-Submit: Avi Drissman <avi@chromium.org>
Commit-Queue: Philip Rogers <pdr@chromium.org>
Reviewed-by: Philip Rogers <pdr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#793126}

cc/paint/solid_color_analyzer.cc

@@ -86,7 +86,7 @@ bool IsSolidColorPaint(const PaintFlags& flags) {
   // https://crbug.com/922899.
   // TODO(andrescj): remove this condition once that bug is fixed.
   is_solid_color = (is_solid_color && SkColorGetA(flags.getColor()) == 255);
-#endif  // OS_MACOSX
+#endif  // OS_MAC
 
   return is_solid_color;
 }
@@ -171,7 +171,7 @@ void CheckIfSolidColor(const SkCanvas& canvas,
   // https://crbug.com/922899.
   // TODO(andrescj): remove this condition once that bug is fixed.
   solid_color_candidate = (solid_color_candidate && alpha == 255);
-#endif  // OS_MACOSX
+#endif  // OS_MAC
 
   if (solid_color_candidate) {
     CalculateSolidColor(color /* src_color */, blendmode,