Mac: Fix bugs in Sierra color fix

ui/accelerated_widget_mac/ca_renderer_layer_tree.h

Index: ui/accelerated_widget_mac/ca_renderer_layer_tree.h
diff --git a/ui/accelerated_widget_mac/ca_renderer_layer_tree.h b/ui/accelerated_widget_mac/ca_renderer_layer_tree.h
index c90bb9399a56a3256c713adb09fd167b7c6d7316..e4724a8f07e28507a520d61bd73f0722d18fc408 100644
--- a/ui/accelerated_widget_mac/ca_renderer_layer_tree.h
+++ b/ui/accelerated_widget_mac/ca_renderer_layer_tree.h
@@ -33,7 +33,8 @@ struct CARendererLayerParams;
 // https://docs.google.com/document/d/1DtSN9zzvCF44_FQPM7ie01UxGHagQ66zfF5L9HnigQY/edit?usp=sharing
 class ACCELERATED_WIDGET_MAC_EXPORT CARendererLayerTree {
  public:
-  CARendererLayerTree(bool allow_av_sample_buffer_display_layer);
+  CARendererLayerTree(bool allow_av_sample_buffer_display_layer,
+                      bool allow_solid_color_layers);
 
   // This will remove all CALayers from this tree from their superlayer.
   ~CARendererLayerTree();
@@ -59,6 +60,9 @@ class ACCELERATED_WIDGET_MAC_EXPORT CARendererLayerTree {
   bool CommitFullscreenLowPowerLayer(
       AVSampleBufferDisplayLayer* fullscreen_low_power_layer);
 
+  // Returns the contents used for a given solid color.
+  id ContentsForSolidColorForTesting(unsigned int color);
+
  private:
   class SolidColorContents;
   struct RootLayer;
@@ -187,6 +191,7 @@ class ACCELERATED_WIDGET_MAC_EXPORT CARendererLayerTree {
   float scale_factor_ = 1;
   bool has_committed_ = false;
   const bool allow_av_sample_buffer_display_layer_ = true;
+  const bool allow_solid_color_layers_ = true;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CARendererLayerTree);