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 4215e276d619e84eef3f25da533dbb65376150ba..66e2eb4ce6675caced7e01406ef72368665be169 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"
 
@@ -29,8 +30,6 @@ class TestCompositorHostX11 : public TestCompositorHost {
   virtual void Show() OVERRIDE;
   virtual ui::Compositor* GetCompositor() OVERRIDE;
 
-  void Draw();
-
   gfx::Rect bounds_;
 
   scoped_ptr<ui::Compositor> compositor_;
@@ -77,11 +76,6 @@ ui::Compositor* TestCompositorHostX11::GetCompositor() {
   return compositor_.get();
 }
 
-void TestCompositorHostX11::Draw() {
-  if (compositor_.get())
-    compositor_->Draw();
-}
-
 // static
 TestCompositorHost* TestCompositorHost::Create(const gfx::Rect& bounds) {
   return new TestCompositorHostX11(bounds);