Add/remove surface references via MojoCompositorFrameSink.

services/ui/surfaces/display_compositor_unittest.cc

Index: services/ui/surfaces/display_compositor_unittest.cc
diff --git a/services/ui/surfaces/display_compositor_unittest.cc b/services/ui/surfaces/display_compositor_unittest.cc
index c1980f88b168201465c180cb0c5c0159dc5d3071..89bc170aa268d852ddc01636e8d7fbd167ada80d 100644
--- a/services/ui/surfaces/display_compositor_unittest.cc
+++ b/services/ui/surfaces/display_compositor_unittest.cc
@@ -16,6 +16,7 @@
 #include "cc/ipc/display_compositor.mojom.h"
 #include "cc/surfaces/surface_id.h"
 #include "cc/surfaces/surface_observer.h"
+#include "cc/surfaces/surface_reference.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "services/ui/common/task_runner_test_base.h"
@@ -65,6 +66,10 @@ class TestDisplayCompositorClient : public cc::mojom::DisplayCompositorClient {
   }
 
   // cc::mojom::DisplayCompositorClient:
+  void OnRootSurfaceId(const cc::SurfaceId& root_surface_id) override {
+    got_root_surface_id_ = true;
+  }
+
   void OnSurfaceCreated(const cc::SurfaceId& surface_id,
                         const gfx::Size& frame_size,
                         float device_scale_factor) override {
@@ -74,6 +79,7 @@ class TestDisplayCompositorClient : public cc::mojom::DisplayCompositorClient {
 
   mojo::Binding<cc::mojom::DisplayCompositorClient> binding_;
   std::string events_;
+  bool got_root_surface_id_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(TestDisplayCompositorClient);
 };
@@ -148,6 +154,10 @@ class DisplayCompositorTest : public TaskRunnerTestBase {
     return size;
   }
 
+  const cc::SurfaceId& GetRootSurfaceId() const {
+    return reference_manager_.GetRootSurfaceId();
+  }
+
   // TaskRunnerTestBase:
   void SetUp() override {
     TaskRunnerTestBase::SetUp();
@@ -182,7 +192,8 @@ TEST_F(DisplayCompositorTest, AddSurfaceThenReference) {
   EXPECT_EQ("Add(0:0:0-2:1:1)", reference_manager_.events());
   EXPECT_EQ(1u, CountTempReferences());
 
-  display_compositor_->AddSurfaceReference(parent_id, surface_id);
+  display_compositor_->AddSurfaceReference(
+      cc::SurfaceReference(parent_id, surface_id));
   RunUntilIdle();
 
   // Real reference is added then temporary reference removed.
@@ -200,7 +211,8 @@ TEST_F(DisplayCompositorTest, AddSurfaceThenRootReference) {
   EXPECT_EQ("Add(0:0:0-1:1:1)", reference_manager_.events());
   EXPECT_EQ(1u, CountTempReferences());
 
-  display_compositor_->AddRootSurfaceReference(surface_id);
+  display_compositor_->AddSurfaceReference(
+      cc::SurfaceReference(GetRootSurfaceId(), surface_id));
   RunUntilIdle();
 
   // Adding real reference doesn't need to change anything in
@@ -223,7 +235,8 @@ TEST_F(DisplayCompositorTest, AddTwoSurfacesThenOneReference) {
   EXPECT_EQ("Add(0:0:0-2:1:1);Add(0:0:0-3:1:1)", reference_manager_.events());
   EXPECT_EQ(2u, CountTempReferences());
 
-  display_compositor_->AddSurfaceReference(parent_id, surface_id1);
+  display_compositor_->AddSurfaceReference(
+      cc::SurfaceReference(parent_id, surface_id1));
   RunUntilIdle();
 
   // Real reference is added then temporary reference removed for 2:1:1. There
@@ -252,7 +265,8 @@ TEST_F(DisplayCompositorTest, AddSurfacesSkipReference) {
   EXPECT_EQ(2u, CountTempReferences());
 
   // Add a reference to the surface with the later LocalFrameId.
-  display_compositor_->AddSurfaceReference(parent_id, surface_id2);
+  display_compositor_->AddSurfaceReference(
+      cc::SurfaceReference(parent_id, surface_id2));
   RunUntilIdle();
 
   // The real reference should be added for 2:1:2 and both temporary references