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

cc/output/renderer_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 "cc/output/delegating_renderer.h"
 #include "cc/output/gl_renderer.h"
 #include "cc/output/output_surface.h"
 #include "cc/test/fake_output_surface_client.h"
 #include "cc/test/fake_renderer_client.h"
 #include "cc/test/fake_resource_provider.h"
@@ skipping 24 matching lines @@
 }
 
 void TestOutputSurface::SwapBuffers(CompositorFrame frame) {
   client_->DidSwapBuffersComplete();
 }
 
 class MockContextProvider : public TestContextProvider {
  public:
   explicit MockContextProvider(
       std::unique_ptr<TestWebGraphicsContext3D> context)
-      : TestContextProvider(base::MakeUnique<TestContextSupport>(),
-                            base::MakeUnique<TestGLES2Interface>(),
+      : TestContextProvider(base::MakeUnique<TestGLES2Interface>(),
                             std::move(context)) {}
   MOCK_METHOD0(DeleteCachedResources, void());
 
  protected:
   ~MockContextProvider() {}
 };
 
 template <class T>
 std::unique_ptr<Renderer> CreateRenderer(RendererClient* client,
                                          const RendererSettings* settings,
@@ skipping 52 matching lines @@
   EXPECT_CALL(*(this->context_provider_.get()), DeleteCachedResources())
       .Times(1);
 
   EXPECT_TRUE(this->renderer_->visible());
   this->renderer_->SetVisible(false);
   EXPECT_FALSE(this->renderer_->visible());
 }
 
 }  // namespace
 }  // namespace cc