Scrollbar Layer revert

cc/layers/scrollbar_layer_impl.h

Index: cc/layers/scrollbar_layer_impl.h
===================================================================
--- cc/layers/scrollbar_layer_impl.h	(revision 215030)
+++ cc/layers/scrollbar_layer_impl.h	(working copy)
@@ -8,7 +8,6 @@
 #include "cc/base/cc_export.h"
 #include "cc/input/scrollbar.h"
 #include "cc/layers/layer_impl.h"
-#include "cc/resources/ui_resource_client.h"
 
 namespace cc {
 
@@ -34,6 +33,8 @@
   virtual void AppendQuads(QuadSink* quad_sink,
                            AppendQuadsData* append_quads_data) OVERRIDE;
 
+  virtual void DidLoseOutputSurface() OVERRIDE;
+
   int scroll_layer_id() const { return scroll_layer_id_; }
   void set_scroll_layer_id(int id) { scroll_layer_id_ = id; }
 
@@ -57,11 +58,11 @@
   void set_vertical_adjust(float vertical_adjust) {
     vertical_adjust_ = vertical_adjust;
   }
-  void set_track_ui_resource_id(UIResourceId uid) {
-    track_ui_resource_id_ = uid;
+  void set_track_resource_id(ResourceProvider::ResourceId id) {
+    track_resource_id_ = id;
   }
-  void set_thumb_ui_resource_id(UIResourceId uid) {
-    thumb_ui_resource_id_ = uid;
+  void set_thumb_resource_id(ResourceProvider::ResourceId id) {
+    thumb_resource_id_ = id;
   }
   void set_visible_to_total_length_ratio(float ratio) {
     visible_to_total_length_ratio_ = ratio;
@@ -86,8 +87,8 @@
 
   gfx::Rect ScrollbarLayerRectToContentRect(gfx::RectF layer_rect) const;
 
-  UIResourceId track_ui_resource_id_;
-  UIResourceId thumb_ui_resource_id_;
+  ResourceProvider::ResourceId track_resource_id_;
+  ResourceProvider::ResourceId thumb_resource_id_;
 
   float current_pos_;
   int maximum_;