Make SingleThreadProxy a SchedulerClient

content/browser/compositor/software_browser_compositor_output_surface_unittest.cc

Index: content/browser/compositor/software_browser_compositor_output_surface_unittest.cc
diff --git a/content/browser/compositor/software_browser_compositor_output_surface_unittest.cc b/content/browser/compositor/software_browser_compositor_output_surface_unittest.cc
index dc80da1a0f20947959bf38e8265eeb18dee2737f..3c1ec16f78d95bec870b87acf645dd40174b619b 100644
--- a/content/browser/compositor/software_browser_compositor_output_surface_unittest.cc
+++ b/content/browser/compositor/software_browser_compositor_output_surface_unittest.cc
@@ -9,6 +9,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/test/context_factories_for_test.h"
+#include "ui/compositor/test/test_compositor_host.h"
 #include "ui/gfx/vsync_provider.h"
 
 namespace {
@@ -70,11 +71,12 @@ class SoftwareBrowserCompositorOutputSurfaceTest : public testing::Test {
   scoped_ptr<content::BrowserCompositorOutputSurface> output_surface_;
 
   scoped_ptr<base::MessageLoop> message_loop_;
-  scoped_ptr<ui::Compositor> compositor_;
 
   IDMap<content::BrowserCompositorOutputSurface> surface_map_;
   scoped_refptr<content::BrowserCompositorOutputSurfaceProxy> surface_proxy_;
 
+  scoped_ptr<ui::TestCompositorHost> window_;

[danakj, 2014/02/21 19:36:21]

s/window_/compositor_host_/

[enne (OOO), 2014/02/21 19:41:32]

Done.

PS
https://code.google.com/p/chromium/codesearch#chromium/src/ui/compositor/laye...

+
   DISALLOW_COPY_AND_ASSIGN(SoftwareBrowserCompositorOutputSurfaceTest);
 };
 
@@ -93,14 +95,17 @@ void SoftwareBrowserCompositorOutputSurfaceTest::SetUp() {
   ui::InitializeContextFactoryForTests(enable_pixel_output);
   ui::Compositor::Initialize();
 
-  compositor_.reset(new ui::Compositor(gfx::kNullAcceleratedWidget));
+  const gfx::Rect host_bounds(10, 10, 500, 500);
+  window_.reset(ui::TestCompositorHost::Create(host_bounds));
+  window_->Show();
+
   surface_proxy_ =
       new content::BrowserCompositorOutputSurfaceProxy(&surface_map_);
 }
 
 void SoftwareBrowserCompositorOutputSurfaceTest::TearDown() {
   output_surface_.reset();
-  compositor_.reset();
+  window_.reset();
 
   EXPECT_TRUE(surface_map_.IsEmpty());
 
@@ -118,7 +123,7 @@ SoftwareBrowserCompositorOutputSurfaceTest::CreateSurface(
           device.Pass(),
           1,
           &surface_map_,
-          compositor_->vsync_manager()));
+          window_->GetCompositor()->vsync_manager()));
 }
 
 TEST_F(SoftwareBrowserCompositorOutputSurfaceTest, NoVSyncProvider) {