Roll Chrome into Mojo.

cc/surfaces/surface.h

Index: cc/surfaces/surface.h
diff --git a/cc/surfaces/surface.h b/cc/surfaces/surface.h
index 96152a036ff08e895cd476165cd47a1c1feac8cc..8e6d7a46cbf454876555dcf632527f4ee994169b 100644
--- a/cc/surfaces/surface.h
+++ b/cc/surfaces/surface.h
@@ -16,6 +16,7 @@
 #include "cc/base/scoped_ptr_vector.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/quads/render_pass_id.h"
+#include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_id.h"
 #include "cc/surfaces/surface_sequence.h"
 #include "cc/surfaces/surfaces_export.h"
@@ -34,7 +35,7 @@ class SurfaceResourceHolder;
 
 class CC_SURFACES_EXPORT Surface {
  public:
-  using DrawCallback = base::Callback<void(bool)>;
+  using DrawCallback = SurfaceFactory::DrawCallback;
 
   Surface(SurfaceId id, SurfaceFactory* factory);
   ~Surface();
@@ -55,7 +56,7 @@ class CC_SURFACES_EXPORT Surface {
   int frame_index() const { return frame_index_; }
 
   void TakeLatencyInfo(std::vector<ui::LatencyInfo>* latency_info);
-  void RunDrawCallbacks();
+  void RunDrawCallbacks(SurfaceDrawStatus drawn);
 
   base::WeakPtr<SurfaceFactory> factory() { return factory_; }