Make IsSolidColor() a property on CC scrollbar layers.

cc/trees/layer_tree_host_unittest.cc

Index: cc/trees/layer_tree_host_unittest.cc
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index e8ea911419ad4ad27287a16d6bd28c2a996e67e4..707157c61763ab24bcb3a317e77d2a66e982e59f 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -328,7 +328,8 @@ class LayerTreeHostTestNoExtraCommitFromScrollbarInvalidate
     bool has_thumb = false;
     scrollbar_ = FakeScrollbarLayer::Create(paint_scrollbar,
                                             has_thumb,
-                                            root_layer_->id());
+                                            root_layer_->id(),
+                                            false);
     scrollbar_->SetPosition(gfx::Point(0, 10));
     scrollbar_->SetBounds(gfx::Size(10, 10));
 
@@ -1053,8 +1054,8 @@ class LayerTreeHostTestAtomicCommit : public LayerTreeHostTest {
 
     bool paint_scrollbar = true;
     bool has_thumb = false;
-    scrollbar_ =
-        FakeScrollbarLayer::Create(paint_scrollbar, has_thumb, layer_->id());
+    scrollbar_ = FakeScrollbarLayer::Create(
+        paint_scrollbar, has_thumb, layer_->id(), false);
     scrollbar_->SetPosition(gfx::Point(0, 10));
     scrollbar_->SetBounds(gfx::Size(10, 10));
 
@@ -1184,14 +1185,14 @@ class LayerTreeHostTestAtomicCommitWithPartialUpdate
 
     bool paint_scrollbar = true;
     bool has_thumb = false;
-    scrollbar_with_paints_ =
-        FakeScrollbarLayer::Create(paint_scrollbar, has_thumb, parent_->id());
+    scrollbar_with_paints_ = FakeScrollbarLayer::Create(
+        paint_scrollbar, has_thumb, parent_->id(), false);
     scrollbar_with_paints_->SetPosition(gfx::Point(3, 10));
     scrollbar_with_paints_->SetBounds(gfx::Size(3, 10));
 
     paint_scrollbar = false;
-    scrollbar_without_paints_ =
-        FakeScrollbarLayer::Create(paint_scrollbar, has_thumb, parent_->id());
+    scrollbar_without_paints_ = FakeScrollbarLayer::Create(
+        paint_scrollbar, has_thumb, parent_->id(), false);
     scrollbar_without_paints_->SetPosition(gfx::Point(6, 10));
     scrollbar_without_paints_->SetBounds(gfx::Size(3, 10));
 
@@ -2798,7 +2799,7 @@ class LayerTreeHostTestDeferredInitialize : public LayerTreeHostTest {
   virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
     // PictureLayer can only be used with impl side painting enabled.
     settings->impl_side_painting = true;
-    settings->solid_color_scrollbars = true;
+    settings->force_solid_color_scrollbars = true;
   }
 
   virtual void SetupTree() OVERRIDE {