Make SingleThreadProxy a SchedulerClient

ui/compositor/test/test_compositor_host_x11.cc

Index: ui/compositor/test/test_compositor_host_x11.cc
diff --git a/ui/compositor/test/test_compositor_host_x11.cc b/ui/compositor/test/test_compositor_host_x11.cc
index 4b940cbd2d7f5de9bebb8b09f71ffb072af052c7..821190b527def819206c50d6dbe847255d5db62f 100644
--- a/ui/compositor/test/test_compositor_host_x11.cc
+++ b/ui/compositor/test/test_compositor_host_x11.cc
@@ -14,6 +14,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "ui/compositor/compositor.h"
+#include "ui/compositor/test/draw_waiter_for_test.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/x/x11_types.h"
 
@@ -30,8 +31,6 @@ class TestCompositorHostX11 : public TestCompositorHost {
   virtual void Show() OVERRIDE;
   virtual ui::Compositor* GetCompositor() OVERRIDE;
 
-  void Draw();
-
   gfx::Rect bounds_;
 
   ui::ContextFactory* context_factory_;
@@ -83,11 +82,6 @@ ui::Compositor* TestCompositorHostX11::GetCompositor() {
   return compositor_.get();
 }
 
-void TestCompositorHostX11::Draw() {
-  if (compositor_.get())
-    compositor_->Draw();
-}
-
 // static
 TestCompositorHost* TestCompositorHost::Create(
     const gfx::Rect& bounds,