Revert of cc: Remove frame queuing from the scheduler.

cc/test/test_compositor_frame_sink.h

 // Copyright 2016 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.
 
 #ifndef CC_TEST_TEST_COMPOSITOR_FRAME_SINK_H_
 #define CC_TEST_TEST_COMPOSITOR_FRAME_SINK_H_
 
 #include "base/memory/weak_ptr.h"
 #include "cc/output/compositor_frame_sink.h"
 #include "cc/output/renderer_settings.h"
@@ skipping 60 matching lines @@
   void ReturnResources(const ReturnedResourceArray& resources) override;
   void SetBeginFrameSource(BeginFrameSource* begin_frame_source) override;
 
   // DisplayClient implementation.
   void DisplayOutputSurfaceLost() override;
   void DisplayWillDrawAndSwap(bool will_draw_and_swap,
                               const RenderPassList& render_passes) override;
   void DisplayDidDrawAndSwap() override;
 
  private:
-  void DidDrawCallback();
+  void DidDrawCallback(bool synchronous);
 
   // TODO(danakj): These don't need to be stored in unique_ptrs when
   // CompositorFrameSink is owned/destroyed on the compositor thread.
   std::unique_ptr<SurfaceManager> surface_manager_;
   std::unique_ptr<SurfaceIdAllocator> surface_id_allocator_;
   SurfaceId delegated_surface_id_;
 
   // Uses surface_manager_.
   std::unique_ptr<SurfaceFactory> surface_factory_;
 
   // Uses surface_manager_.
   std::unique_ptr<Display> display_;
 
   bool bound_ = false;
   TestCompositorFrameSinkClient* test_client_ = nullptr;
   gfx::Size enlarge_pass_texture_amount_;
 
   std::vector<std::unique_ptr<CopyOutputRequest>> copy_requests_;
+
+  base::WeakPtrFactory<TestCompositorFrameSink> weak_ptrs_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_TEST_COMPOSITOR_FRAME_SINK_H_