Make IsSolidColor() a property on CC scrollbar layers.

cc/trees/layer_tree_host_impl_unittest.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/layer_tree_host_impl.h"
 
 #include <cmath>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 63 matching lines @@
         reduce_memory_result_(true),
         current_limit_bytes_(0),
         current_priority_cutoff_value_(0) {
     media::InitializeMediaLibraryForTesting();
   }
 
   virtual void SetUp() OVERRIDE {
     LayerTreeSettings settings;
     settings.minimum_occlusion_tracking_size = gfx::Size();
     settings.impl_side_painting = true;
-    settings.solid_color_scrollbars = true;
+    settings.force_solid_color_scrollbars = true;
 
     host_impl_ = LayerTreeHostImpl::Create(settings,
                                            this,
                                            &proxy_,
                                            &stats_instrumentation_);
     host_impl_->InitializeRenderer(CreateOutputSurface());
     host_impl_->SetViewportSize(gfx::Size(10, 10));
   }
 
   virtual void TearDown() OVERRIDE {}
@@ skipping 594 matching lines @@
   // Trying to scroll without a vertical scrollbar will fail.
   EXPECT_FALSE(host_impl_->ScrollVerticallyByPage(
       gfx::Point(), SCROLL_FORWARD));
   EXPECT_FALSE(host_impl_->ScrollVerticallyByPage(
       gfx::Point(), SCROLL_BACKWARD));
 
   scoped_ptr<cc::ScrollbarLayerImpl> vertical_scrollbar(
       cc::ScrollbarLayerImpl::Create(
           host_impl_->active_tree(),
           20,
-          VERTICAL));
+          VERTICAL,
+          false));
   vertical_scrollbar->SetBounds(gfx::Size(15, 1000));
   host_impl_->RootScrollLayer()->SetVerticalScrollbarLayer(
       vertical_scrollbar.get());
 
   // Trying to scroll with a vertical scrollbar will succeed.
   EXPECT_TRUE(host_impl_->ScrollVerticallyByPage(
       gfx::Point(), SCROLL_FORWARD));
   EXPECT_FLOAT_EQ(875.f, host_impl_->RootScrollLayer()->ScrollDelta().y());
   EXPECT_TRUE(host_impl_->ScrollVerticallyByPage(
       gfx::Point(), SCROLL_BACKWARD));
@@ skipping 342 matching lines @@
 
   scoped_ptr<LayerImpl> contents =
       LayerImpl::Create(host_impl_->active_tree(), 3);
   contents->SetDrawsContent(true);
   contents->SetBounds(content_size);
   contents->SetContentBounds(content_size);
 
   scoped_ptr<ScrollbarLayerImpl> scrollbar = ScrollbarLayerImpl::Create(
       host_impl_->active_tree(),
       4,
-      VERTICAL);
+      VERTICAL,
+      false);
   scroll->SetVerticalScrollbarLayer(scrollbar.get());
 
   scroll->AddChild(contents.Pass());
   root->AddChild(scroll.Pass());
   root->AddChild(scrollbar.PassAs<LayerImpl>());
 
   host_impl_->active_tree()->SetRootLayer(root.Pass());
   host_impl_->active_tree()->DidBecomeActive();
   InitializeRendererAndDrawFrame();
 
@@ skipping 5012 matching lines @@
   EXPECT_EQ(actual_policy, host_impl_->ActualManagedMemoryPolicy());
   EXPECT_EQ(policy1.bytes_limit_when_visible, current_limit_bytes_);
   EXPECT_EQ(visible_cutoff_value, current_priority_cutoff_value_);
   host_impl_->SetVisible(false);
   EXPECT_EQ(policy1.bytes_limit_when_not_visible, current_limit_bytes_);
   EXPECT_EQ(not_visible_cutoff_value, current_priority_cutoff_value_);
 }
 
 }  // namespace
 }  // namespace cc