Decouple BrowserCompositorOutputSurface from BeginFrameSource.

content/browser/compositor/reflector_impl_unittest.cc

Index: content/browser/compositor/reflector_impl_unittest.cc
diff --git a/content/browser/compositor/reflector_impl_unittest.cc b/content/browser/compositor/reflector_impl_unittest.cc
index 8d8d6bc04ddb0266a6eba9d6e3195c1553d38302..e27b86b62ef8b7865aab5fbe9335076b1318dc9a 100644
--- a/content/browser/compositor/reflector_impl_unittest.cc
+++ b/content/browser/compositor/reflector_impl_unittest.cc
@@ -77,13 +77,10 @@ CreateTestValidatorOzone() {
 class TestOutputSurface : public BrowserCompositorOutputSurface {
  public:
   TestOutputSurface(scoped_refptr<cc::ContextProvider> context_provider,
-                    scoped_refptr<ui::CompositorVSyncManager> vsync_manager,
-                    cc::SyntheticBeginFrameSource* begin_frame_source)
+                    scoped_refptr<ui::CompositorVSyncManager> vsync_manager)
       : BrowserCompositorOutputSurface(std::move(context_provider),
                                        std::move(vsync_manager),
-                                       begin_frame_source,
-                                       CreateTestValidatorOzone()) {
-  }
+                                       CreateTestValidatorOzone()) {}
 
   void SetFlip(bool flip) { capabilities_.flipped_output_surface = flip; }
 
@@ -141,12 +138,12 @@ class ReflectorImplTest : public testing::Test {
     compositor_.reset(
         new ui::Compositor(context_factory, compositor_task_runner_.get()));
     compositor_->SetAcceleratedWidget(gfx::kNullAcceleratedWidget);
+    compositor_->vsync_manager()->AddObserver(begin_frame_source_.get());
 
     auto context_provider = cc::TestContextProvider::Create();
     context_provider->BindToCurrentThread();
     output_surface_ = base::MakeUnique<TestOutputSurface>(
-        std::move(context_provider), compositor_->vsync_manager(),
-        begin_frame_source_.get());
+        std::move(context_provider), compositor_->vsync_manager());
 
     root_layer_.reset(new ui::Layer(ui::LAYER_SOLID_COLOR));
     compositor_->SetRootLayer(root_layer_.get());