Revert of Pinch/Zoom Infrastructure & Plumbing CL

cc/test/fake_painted_scrollbar_layer.h

Index: cc/test/fake_painted_scrollbar_layer.h
diff --git a/cc/test/fake_painted_scrollbar_layer.h b/cc/test/fake_painted_scrollbar_layer.h
index 736a45097a03805ce65fc8f6aa05cdc620052b72..9b1b13dab2cc555f2a79768670226a7ed5eb7015 100644
--- a/cc/test/fake_painted_scrollbar_layer.h
+++ b/cc/test/fake_painted_scrollbar_layer.h
@@ -16,7 +16,7 @@
 class FakePaintedScrollbarLayer : public PaintedScrollbarLayer {
  public:
   static scoped_refptr<FakePaintedScrollbarLayer>
-      Create(bool paint_during_update, bool has_thumb, Layer* scrolling_layer);
+      Create(bool paint_during_update, bool has_thumb, int scrolling_layer_id);
   int update_count() const { return update_count_; }
   void reset_update_count() { update_count_ = 0; }
 
@@ -44,7 +44,7 @@
 
  private:
   FakePaintedScrollbarLayer(FakeScrollbar* fake_scrollbar,
-                            Layer* scrolling_layer);
+                            int scrolling_layer_id);
   virtual ~FakePaintedScrollbarLayer();
 
   int update_count_;