Revert of cc: Make LayerTreeTests use a DelegatingRenderer and Display.

cc/layers/surface_layer_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdint.h>
 
 #include <set>
 #include <vector>
 
 #include "base/location.h"
@@ skipping 156 matching lines @@
   scoped_refptr<Layer> blank_layer_;
   SurfaceSequence satisfied_sequence_;
 
   SurfaceId required_id_;
   std::set<SurfaceSequence> required_set_;
 };
 
 // Check that SurfaceSequence is sent through swap promise.
 class SurfaceLayerSwapPromiseWithDraw : public SurfaceLayerSwapPromise {
  public:
+  SurfaceLayerSwapPromiseWithDraw() : SurfaceLayerSwapPromise() {}
+
+  std::unique_ptr<OutputSurface> CreateOutputSurface() override {
+    auto ret = FakeOutputSurface::CreateDelegating3d();
+    output_surface_ = ret.get();
+    return std::move(ret);
+  }
+
   void ChangeTree() override {
     ++commit_count_;
     switch (commit_count_) {
       case 1:
         // Remove SurfaceLayer from tree to cause SwapPromise to be created.
         layer_tree_host()->SetRootLayer(blank_layer_);
         break;
       case 2:
         break;
       default:
         NOTREACHED();
         break;
     }
   }
 
-  void DisplayReceivedCompositorFrameOnThread(
-      const CompositorFrame& frame) override {
-    const std::vector<uint32_t>& satisfied = frame.metadata.satisfies_sequences;
+  void SwapBuffersCompleteOnThread() override {
+    std::vector<uint32_t>& satisfied =
+        output_surface_->last_sent_frame()->metadata.satisfies_sequences;
     EXPECT_LE(satisfied.size(), 1u);
     if (satisfied.size() == 1) {
       // Eventually the one SurfaceSequence should be satisfied, but only
       // after the layer was removed from the tree, and only once.
       EXPECT_EQ(1u, satisfied[0]);
       EXPECT_LE(1, commit_count_);
       EXPECT_FALSE(sequence_was_satisfied_);
       sequence_was_satisfied_ = true;
       EndTest();
     }
   }
 
   void AfterTest() override {
     EXPECT_TRUE(required_id_ == SurfaceId(kArbitraryClientId, 1, 0));
     EXPECT_EQ(1u, required_set_.size());
     // Sequence should have been satisfied through Swap, not with the
     // callback.
     EXPECT_TRUE(satisfied_sequence_.is_null());
   }
+
+  FakeOutputSurface* output_surface_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(SurfaceLayerSwapPromiseWithDraw);
 
 // Check that SurfaceSequence is sent through swap promise and resolved when
 // swap fails.
 class SurfaceLayerSwapPromiseWithoutDraw : public SurfaceLayerSwapPromise {
  public:
   SurfaceLayerSwapPromiseWithoutDraw() : SurfaceLayerSwapPromise() {}
 
@@ skipping 24 matching lines @@
     EXPECT_EQ(1u, required_set_.size());
     // Sequence should have been satisfied with the callback.
     EXPECT_TRUE(satisfied_sequence_ == SurfaceSequence(1u, 1u));
   }
 };
 
 MULTI_THREAD_TEST_F(SurfaceLayerSwapPromiseWithoutDraw);
 
 }  // namespace
 }  // namespace cc