Remove solid_color_scrollbar_thickness_dip from LayerTreeSettings.

cc/layers/painted_scrollbar_layer.cc

 // Copyright 2013 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/layers/painted_scrollbar_layer.h"
 
 #include "base/auto_reset.h"
 #include "base/basictypes.h"
 #include "base/debug/trace_event.h"
 #include "cc/layers/painted_scrollbar_layer_impl.h"
@@ skipping 91 matching lines @@
 }
 
 void PaintedScrollbarLayer::PushPropertiesTo(LayerImpl* layer) {
   ContentsScalingLayer::PushPropertiesTo(layer);
 
   PaintedScrollbarLayerImpl* scrollbar_layer =
       static_cast<PaintedScrollbarLayerImpl*>(layer);
 
   if (layer_tree_host() &&
       layer_tree_host()->settings().solid_color_scrollbars) {
-    int thickness_override =
-        layer_tree_host()->settings().solid_color_scrollbar_thickness_dip;
-    if (thickness_override != -1) {
-      scrollbar_layer->SetThumbThickness(thickness_override);
-    } else {
-      if (Orientation() == HORIZONTAL)
-        scrollbar_layer->SetThumbThickness(bounds().height());
-      else
-        scrollbar_layer->SetThumbThickness(bounds().width());
-    }
+    scrollbar_layer->SetThumbThickness(scrollbar_->ThumbThickness());
   } else {
     scrollbar_layer->SetThumbThickness(thumb_thickness_);
   }
   scrollbar_layer->SetThumbLength(thumb_length_);
   if (Orientation() == HORIZONTAL) {
     scrollbar_layer->SetTrackStart(
         track_rect_.x() - scrollbar_->Location().x());
     scrollbar_layer->SetTrackLength(track_rect_.width());
   } else {
     scrollbar_layer->SetTrackStart(
@@ skipping 117 matching lines @@
   paint.setXfermodeMode(SkXfermode::kClear_Mode);
   skcanvas.drawRect(layer_skrect, paint);
   skcanvas.clipRect(layer_skrect);
 
   scrollbar_->PaintPart(&skcanvas, part, layer_rect);
 
   return bitmap;
 }
 
 }  // namespace cc