Make SingleThreadProxy a SchedulerClient

ui/compositor/compositor.h

Index: ui/compositor/compositor.h
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
index 21c582e30da5fb5ab52ff6b1c3b84ccf52c894c2..eab51a629a1d408696abf686367c7b6bd8a373b6 100644
--- a/ui/compositor/compositor.h
+++ b/ui/compositor/compositor.h
@@ -21,8 +21,6 @@
 #include "ui/gfx/size.h"
 #include "ui/gfx/vector2d.h"
 
-class SkBitmap;
-
 namespace base {
 class MessageLoopProxy;
 class RunLoop;
@@ -49,7 +47,6 @@ namespace ui {
 class Compositor;
 class CompositorVSyncManager;
 class Layer;
-class PostedSwapQueue;
 class Reflector;
 class Texture;
 struct LatencyInfo;
@@ -199,9 +196,6 @@ class COMPOSITOR_EXPORT Compositor
   // compositing layers on.
   float device_scale_factor() const { return device_scale_factor_; }
 
-  // Draws the scene created by the layer tree and any visual effects.
-  void Draw();
-
   // Where possible, draws are scissored to a damage region calculated from
   // changes to layer properties.  This bypasses that and indicates that
   // the whole frame needs to be drawn.
@@ -292,9 +286,6 @@ class COMPOSITOR_EXPORT Compositor
   // Called to release any pending CompositorLock
   void CancelCompositorLock();
 
-  // Notifies the compositor that compositing is complete.
-  void NotifyEnd();
-
   gfx::Size size_;
 
   // The root of the Layer tree drawn by this compositor.
@@ -309,9 +300,6 @@ class COMPOSITOR_EXPORT Compositor
   // The manager of vsync parameters for this compositor.
   scoped_refptr<CompositorVSyncManager> vsync_manager_;
 
-  // Used to verify that we have at most one draw swap in flight.
-  scoped_ptr<PostedSwapQueue> posted_swaps_;
-
   // The device scale factor of the monitor that this compositor is compositing
   // layers on.
   float device_scale_factor_;
@@ -319,19 +307,10 @@ class COMPOSITOR_EXPORT Compositor
   int last_started_frame_;
   int last_ended_frame_;
 
-  bool next_draw_is_resize_;
-
   bool disable_schedule_composite_;
 
   CompositorLock* compositor_lock_;
 
-  // Prevent more than one draw from being scheduled.
-  bool defer_draw_scheduling_;
-
-  // Used to prevent Draw()s while a composite is in progress.
-  bool waiting_on_compositing_end_;
-  bool draw_on_compositing_end_;
-
   base::WeakPtrFactory<Compositor> schedule_draw_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Compositor);