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 eeb69bfe9b0ddb70ed50dca6ec9790976586dbeb..986798b7f0eb69beb8c4dd0e2a309eae98d09578 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"
@@ -70,12 +71,17 @@ class TestDisplayCompositorClient : public cc::mojom::DisplayCompositorClient {
   void OnSurfaceCreated(const cc::SurfaceId& surface_id,
                         const gfx::Size& frame_size,
                         float device_scale_factor) override {
+    EXPECT_TRUE(got_root_surface_id_);
     AddEvent(base::StringPrintf("OnSurfaceCreated(%s)",
                                 SurfaceIdString(surface_id).c_str()));
   }
+  void OnRootSurfaceId(const cc::SurfaceId& root_surface_id) override {
+    got_root_surface_id_ = true;
+  }
 
   mojo::Binding<cc::mojom::DisplayCompositorClient> binding_;
   std::string events_;
+  bool got_root_surface_id_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(TestDisplayCompositorClient);
 };
@@ -88,18 +94,20 @@ class TestSurfaceReferenceManager : public cc::SurfaceReferenceManager {
 
   const SurfaceId& GetRootSurfaceId() const override { return root_id_; }
 
-  void AddSurfaceReference(const SurfaceId& parent_id,
+  bool AddSurfaceReference(const SurfaceId& parent_id,
                            const SurfaceId& child_id) override {
     AddEvent(base::StringPrintf("Add(%s-%s)",
                                 SurfaceIdString(parent_id).c_str(),
                                 SurfaceIdString(child_id).c_str()));
+    return true;
   }
 
-  void RemoveSurfaceReference(const SurfaceId& parent_id,
+  bool RemoveSurfaceReference(const SurfaceId& parent_id,
                               const SurfaceId& child_id) override {
     AddEvent(base::StringPrintf("Remove(%s-%s)",
                                 SurfaceIdString(parent_id).c_str(),
                                 SurfaceIdString(child_id).c_str()));
+    return true;
   }
 
   size_t GetSurfaceReferenceCount(const SurfaceId& surface_id) const override {
@@ -139,6 +147,10 @@ class DisplayCompositorTest : public TaskRunnerTestBase {
 
   cc::SurfaceObserver* surface_observer() { return display_compositor_.get(); }
 
+  const cc::SurfaceId& GetRootSurfaceId() {
+    return reference_manager_.GetRootSurfaceId();
+  }
+
   // Returns the total number of temporary references held by DisplayCompositor.
   size_t CountTempReferences() {
     size_t size = 0;
@@ -182,7 +194,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 +213,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 +237,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 +267,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