Take 2 at removing thumb thickness compositor setting.

Instead, we get the value from blink (landed in blink r157790).
No change in behavior on Android or Desktop.

BUG=None

Review URL: https://chromiumcodereview.appspot.com/24182003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223558 0039d316-1c4b-4281-b951-d872f2087c98

cc/layers/scrollbar_layer_unittest.cc

@@ -266,7 +266,6 @@ TEST(ScrollbarLayerTest, SolidColorDrawQuads) {
   const int kTrackLength = 100;
 
   LayerTreeSettings layer_tree_settings;
-  layer_tree_settings.solid_color_scrollbar_thickness_dip = kThumbThickness;
   scoped_ptr<FakeLayerTreeHost> host =
       FakeLayerTreeHost::Create(layer_tree_settings);
 
@@ -329,7 +328,6 @@ TEST(ScrollbarLayerTest, LayerDrivenSolidColorDrawQuads) {
   const int kTrackLength = 10;
 
   LayerTreeSettings layer_tree_settings;
-  layer_tree_settings.solid_color_scrollbar_thickness_dip = 3;
   scoped_ptr<FakeLayerTreeHost> host =
       FakeLayerTreeHost::Create(layer_tree_settings);
 

cc/layers/solid_color_scrollbar_layer_impl.cc

@@ -46,15 +46,6 @@ void SolidColorScrollbarLayerImpl::PushPropertiesTo(LayerImpl* layer) {
 }
 
 int SolidColorScrollbarLayerImpl::ThumbThickness() const {
-  // TODO(wjmaclean) This should be removed when
-  // solid_color_scrollbar_thickness_dip is removed.
-  int thickness_override =
-      layer_tree_impl()
-          ? layer_tree_impl()->settings().solid_color_scrollbar_thickness_dip
-          : -1;
-  if (thickness_override != -1)
-    return thickness_override;
-
   if (thumb_thickness_ != -1)
     return thumb_thickness_;
 

cc/trees/layer_tree_settings.cc

@@ -31,7 +31,6 @@ LayerTreeSettings::LayerTreeSettings()
       scrollbar_linear_fade_length_ms(300),
       solid_color_scrollbars(false),
       solid_color_scrollbar_color(SK_ColorWHITE),
-      solid_color_scrollbar_thickness_dip(-1),
       calculate_top_controls_position(false),
       use_memory_management(true),
       timeout_and_draw_when_animation_checkerboards(true),

cc/trees/layer_tree_settings.h

@@ -42,7 +42,6 @@ class CC_EXPORT LayerTreeSettings {
   int scrollbar_linear_fade_length_ms;
   bool solid_color_scrollbars;
   SkColor solid_color_scrollbar_color;
-  int solid_color_scrollbar_thickness_dip;
   bool calculate_top_controls_position;
   bool use_memory_management;
   bool timeout_and_draw_when_animation_checkerboards;

content/renderer/gpu/render_widget_compositor.cc

@@ -272,7 +272,6 @@ scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create(
       cmd->HasSwitch(switches::kHideScrollbars)
           ? SK_ColorTRANSPARENT
           : SkColorSetARGB(128, 128, 128, 128);
-  settings.solid_color_scrollbar_thickness_dip = 3;
   settings.highp_threshold_min = 2048;
   // Android WebView handles root layer flings itself.
   settings.ignore_root_layer_flings =
@@ -285,7 +284,6 @@ scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create(
   if (cmd->HasSwitch(cc::switches::kEnablePinchVirtualViewport) ||
       cmd->HasSwitch(switches::kEnableOverlayScrollbars)) {
     settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128);
-    settings.solid_color_scrollbar_thickness_dip = 7;
   }
 #endif