Update from https://crrev.com/308331

cc/surfaces/surface.h

 // Copyright 2014 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_SURFACES_SURFACE_H_
 #define CC_SURFACES_SURFACE_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 16 matching lines @@
 
 namespace cc {
 class CompositorFrame;
 class CopyOutputRequest;
 class SurfaceManager;
 class SurfaceFactory;
 class SurfaceResourceHolder;
 
 class CC_SURFACES_EXPORT Surface {
  public:
+  using DrawCallback = base::Callback<void(bool)>;
+
   Surface(SurfaceId id, SurfaceFactory* factory);
   ~Surface();
 
   SurfaceId surface_id() const { return surface_id_; }
 
   void QueueFrame(scoped_ptr<CompositorFrame> frame,
-                  const base::Closure& draw_callback);
+                  const DrawCallback& draw_callback);
   void RequestCopyOfOutput(scoped_ptr<CopyOutputRequest> copy_request);
   // Adds each CopyOutputRequest in the current frame to copy_requests. The
   // caller takes ownership of them.
   void TakeCopyOutputRequests(
       std::multimap<RenderPassId, CopyOutputRequest*>* copy_requests);
   // Returns the most recent frame that is eligible to be rendered.
   const CompositorFrame* GetEligibleFrame();
 
   // Returns a number that increments by 1 every time a new frame is enqueued.
   int frame_index() const { return frame_index_; }
@@ skipping 18 matching lines @@
  private:
   void ClearCopyRequests();
 
   SurfaceId surface_id_;
   base::WeakPtr<SurfaceFactory> factory_;
   // TODO(jamesr): Support multiple frames in flight.
   scoped_ptr<CompositorFrame> current_frame_;
   int frame_index_;
   std::vector<SurfaceSequence> destruction_dependencies_;
 
-  base::Closure draw_callback_;
+  DrawCallback draw_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(Surface);
 };
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_SURFACE_H_