TestCompositorFrameSink should use CompositorFrameSinkSupport

cc/layers/texture_layer_unittest.cc

Index: cc/layers/texture_layer_unittest.cc
diff --git a/cc/layers/texture_layer_unittest.cc b/cc/layers/texture_layer_unittest.cc
index 998c6291e3b13e612b3a0908286e3eee16a23dc0..a7c59ba9c8486aa1c6418f2465c34d6315436de7 100644
--- a/cc/layers/texture_layer_unittest.cc
+++ b/cc/layers/texture_layer_unittest.cc
@@ -1176,6 +1176,16 @@ class TextureLayerChangeInvisibleMailboxTest
   void MailboxReleased(const gpu::SyncToken& sync_token, bool lost_resource) {
     EXPECT_TRUE(sync_token.HasData());
     ++mailbox_returned_;
+    switch (mailbox_returned_) {
+      case 1:
+        break;
+      case 2:
+        EXPECT_EQ(commit_count_, 5);
+        EndTest();
+        break;
+      default:
+        NOTREACHED();
+    }
   }
 
   void SetupTree() override {
@@ -1240,8 +1250,6 @@ class TextureLayerChangeInvisibleMailboxTest
         texture_layer_->ClearClient();
         break;
       case 5:
-        EXPECT_EQ(2, mailbox_returned_);
-        EndTest();
         break;
       default:
         NOTREACHED();