Hook up ui::Compositor to Display's BeginFrameSource

cc/surfaces/surface_display_output_surface_unittest.cc

Index: cc/surfaces/surface_display_output_surface_unittest.cc
diff --git a/cc/surfaces/surface_display_output_surface_unittest.cc b/cc/surfaces/surface_display_output_surface_unittest.cc
index 367891cd5b7eb3802d08c64e16eb28e4b1f7822e..293211781764c4df4e13483e2a6fb3f0a1e2bd14 100644
--- a/cc/surfaces/surface_display_output_surface_unittest.cc
+++ b/cc/surfaces/surface_display_output_surface_unittest.cc
@@ -25,13 +25,15 @@ class FakeOnscreenDisplayClient : public OnscreenDisplayClient {
       SharedBitmapManager* bitmap_manager,
       gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
       const RendererSettings& settings,
-      scoped_refptr<base::SingleThreadTaskRunner> task_runner)
+      scoped_refptr<base::SingleThreadTaskRunner> task_runner,
+      uint32_t compositor_surface_namespace)
       : OnscreenDisplayClient(FakeOutputSurface::Create3d(),
                               manager,
                               bitmap_manager,
                               gpu_memory_buffer_manager,
                               settings,
-                              task_runner) {
+                              task_runner,
+                              compositor_surface_namespace) {
     // Ownership is passed to another object later, store a pointer
     // to it now for future reference.
     fake_output_surface_ =
@@ -57,7 +59,8 @@ class SurfaceDisplayOutputSurfaceTest : public testing::Test {
                         &bitmap_manager_,
                         &gpu_memory_buffer_manager_,
                         renderer_settings_,
-                        task_runner_),
+                        task_runner_,
+                        allocator_.id_namespace()),
         context_provider_(TestContextProvider::Create()),
         surface_display_output_surface_(&surface_manager_,
                                         &allocator_,
@@ -68,8 +71,16 @@ class SurfaceDisplayOutputSurfaceTest : public testing::Test {
     display_client_.set_surface_output_surface(
         &surface_display_output_surface_);
     surface_display_output_surface_.set_display_client(&display_client_);
+
+    // Set the Display's begin frame source like a real browser compositor
+    // output surface would.
+    begin_frame_source_ =
+        BackToBackBeginFrameSource::Create(task_runner_.get());
+    display_client_.display()->SetBeginFrameSource(begin_frame_source_.get());
+
     surface_display_output_surface_.BindToClient(
         &surface_display_output_surface_client_);
+
     display_client_.display()->Resize(display_size_);
 
     EXPECT_FALSE(surface_display_output_surface_client_
@@ -104,6 +115,7 @@ class SurfaceDisplayOutputSurfaceTest : public testing::Test {
  protected:
   scoped_ptr<base::SimpleTestTickClock> now_src_;
   scoped_refptr<OrderedSimpleTaskRunner> task_runner_;
+  scoped_ptr<BackToBackBeginFrameSource> begin_frame_source_;
   SurfaceIdAllocator allocator_;
 
   const gfx::Size display_size_;