[WIP] cc: Plumb SurfaceId from clients

ui/compositor/test/draw_waiter_for_test.cc

Index: ui/compositor/test/draw_waiter_for_test.cc
diff --git a/ui/compositor/test/draw_waiter_for_test.cc b/ui/compositor/test/draw_waiter_for_test.cc
index 92f6698bf3dfa0ed9e5ebd465a39b8ad1aea7028..1a2cb612e72935e8b01d89952e382abe899354fb 100644
--- a/ui/compositor/test/draw_waiter_for_test.cc
+++ b/ui/compositor/test/draw_waiter_for_test.cc
@@ -9,6 +9,12 @@
 namespace ui {
 
 // static
+void DrawWaiterForTest::WaitForCompositingInitialized(Compositor* compositor) {
+  DrawWaiterForTest waiter(WAIT_FOR_COMPOSITING_INITIALIZED);
+  waiter.WaitImpl(compositor);
+}
+
+// static
 void DrawWaiterForTest::WaitForCompositingStarted(Compositor* compositor) {
   DrawWaiterForTest waiter(WAIT_FOR_COMPOSITING_STARTED);
   waiter.WaitImpl(compositor);
@@ -38,6 +44,11 @@ void DrawWaiterForTest::WaitImpl(Compositor* compositor) {
   compositor->RemoveObserver(this);
 }
 
+void DrawWaiterForTest::OnCompositingInitialized(Compositor* compositor) {
+  if (wait_event_ == WAIT_FOR_COMPOSITING_INITIALIZED)
+    wait_run_loop_->Quit();
+}
+
 void DrawWaiterForTest::OnCompositingDidCommit(Compositor* compositor) {
   if (wait_event_ == WAIT_FOR_COMMIT)
     wait_run_loop_->Quit();