Revert of Enable BeginFrame scheduling on aura

content/browser/compositor/reflector_impl_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "cc/test/fake_output_surface_client.h"
 #include "cc/test/test_context_provider.h"
 #include "cc/test/test_web_graphics_context_3d.h"
@@ skipping 51 matching lines @@
   return scoped_ptr<BrowserCompositorOverlayCandidateValidator>(
       new BrowserCompositorOverlayCandidateValidatorOzone(
           0, new TestOverlayCandidatesOzone()));
 #else
   return nullptr;
 #endif  // defined(USE_OZONE)
 }
 
 class TestOutputSurface : public BrowserCompositorOutputSurface {
  public:
-  explicit TestOutputSurface(
-      const scoped_refptr<cc::ContextProvider>& context_provider)
+  TestOutputSurface(
+      const scoped_refptr<cc::ContextProvider>& context_provider,
+      const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager)
       : BrowserCompositorOutputSurface(context_provider,
+                                       vsync_manager,
                                        CreateTestValidatorOzone().Pass()) {}
 
   void SetFlip(bool flip) { capabilities_.flipped_output_surface = flip; }
 
   void SwapBuffers(cc::CompositorFrame* frame) override {}
 
 #if defined(OS_MACOSX)
   void OnSurfaceDisplayed() override {}
   void SetSurfaceSuspendedForRecycle(bool suspended) override {}
   bool SurfaceShouldNotShowFramesAfterSuspendForRecycle() const override {
@@ skipping 19 matching lines @@
             new NoTransportImageTransportFactory));
     message_loop_.reset(new base::MessageLoop());
     proxy_ = message_loop_->message_loop_proxy();
     compositor_task_runner_ = new FakeTaskRunner();
     compositor_.reset(new ui::Compositor(gfx::kNullAcceleratedWidget,
                                          context_factory,
                                          compositor_task_runner_.get()));
     context_provider_ = cc::TestContextProvider::Create(
         cc::TestWebGraphicsContext3D::Create().Pass());
     output_surface_ =
-        scoped_ptr<TestOutputSurface>(new TestOutputSurface(context_provider_));
+        scoped_ptr<TestOutputSurface>(
+            new TestOutputSurface(context_provider_,
+                                  compositor_->vsync_manager())).Pass();
     CHECK(output_surface_->BindToClient(&output_surface_client_));
 
     mirroring_layer_.reset(new ui::Layer(ui::LAYER_SOLID_COLOR));
     gfx::Size size = output_surface_->SurfaceSize();
     mirroring_layer_->SetBounds(gfx::Rect(size.width(), size.height()));
   }
 
   void SetUpReflector() {
     reflector_ = make_scoped_ptr(
         new ReflectorImpl(compositor_.get(), mirroring_layer_.get()));
@@ skipping 65 matching lines @@
   plane_2.plane_z_order = 1;
   list.push_back(plane_1);
   list.push_back(plane_2);
   output_surface_->GetOverlayCandidateValidator()->CheckOverlaySupport(&list);
   EXPECT_FALSE(list[0].overlay_handled);
 }
 #endif  // defined(USE_OZONE)
 
 }  // namespace
 }  // namespace content