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

cc/test/layer_tree_pixel_test.h

 // Copyright 2013 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.
 
 #ifndef CC_TEST_LAYER_TREE_PIXEL_TEST_H_
 #define CC_TEST_LAYER_TREE_PIXEL_TEST_H_
 
 #include <memory>
 #include <vector>
 
@@ skipping 23 matching lines @@
   enum PixelTestType {
     PIXEL_TEST_GL,
     PIXEL_TEST_SOFTWARE,
   };
 
  protected:
   LayerTreePixelTest();
   ~LayerTreePixelTest() override;
 
   // LayerTreeTest overrides.
-  std::unique_ptr<TestDelegatingOutputSurface> CreateDelegatingOutputSurface(
-      scoped_refptr<ContextProvider> compositor_context_provider,
-      scoped_refptr<ContextProvider> worker_context_provider) override;
-  std::unique_ptr<OutputSurface> CreateDisplayOutputSurface(
-      scoped_refptr<ContextProvider> compositor_context_provider) override;
+  void InitializeSettings(LayerTreeSettings* settings) override;
+  std::unique_ptr<OutputSurface> CreateOutputSurface() override;
 
   virtual std::unique_ptr<CopyOutputRequest> CreateCopyOutputRequest();
 
   void ReadbackResult(std::unique_ptr<CopyOutputResult> result);
 
   void BeginTest() override;
   void SetupTree() override;
   void AfterTest() override;
   void EndTest() override;
 
@@ skipping 46 matching lines @@
   base::FilePath ref_file_;
   std::unique_ptr<SkBitmap> result_bitmap_;
   std::vector<scoped_refptr<TextureLayer>> texture_layers_;
   int pending_texture_mailbox_callbacks_;
   gfx::Size enlarge_texture_amount_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_LAYER_TREE_PIXEL_TEST_H_