[WIP] cc: Plumb SurfaceId from clients

ui/compositor/test/draw_waiter_for_test.h

Index: ui/compositor/test/draw_waiter_for_test.h
diff --git a/ui/compositor/test/draw_waiter_for_test.h b/ui/compositor/test/draw_waiter_for_test.h
index 0c4c195fae63edb8e7e59c0df3fac3e7ff7e5a1e..1f3ab01c05e7dfd6717a60f0d3a318adfb5740c9 100644
--- a/ui/compositor/test/draw_waiter_for_test.h
+++ b/ui/compositor/test/draw_waiter_for_test.h
@@ -20,6 +20,9 @@ namespace ui {
 // potential for re-entrancy).
 class DrawWaiterForTest : public CompositorObserver {
  public:
+  // Waits for the compositor to get an OutputSurface.
+  static void WaitForCompositingInitialized(Compositor* compositor);
+
   // Waits for a draw to be issued by the compositor. If the test times out
   // here, there may be a logic error in the compositor code causing it
   // not to draw.
@@ -34,6 +37,7 @@ class DrawWaiterForTest : public CompositorObserver {
  private:
   enum WaitEvent {
     WAIT_FOR_COMMIT,
+    WAIT_FOR_COMPOSITING_INITIALIZED,
     WAIT_FOR_COMPOSITING_STARTED,
     WAIT_FOR_COMPOSITING_ENDED,
   };
@@ -43,6 +47,7 @@ class DrawWaiterForTest : public CompositorObserver {
   void WaitImpl(Compositor* compositor);
 
   // CompositorObserver implementation.
+  void OnCompositingInitialized(Compositor* compositor) override;
   void OnCompositingDidCommit(Compositor* compositor) override;
   void OnCompositingStarted(Compositor* compositor,
                             base::TimeTicks start_time) override;