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

cc/test/test_context_provider.h

Index: cc/test/test_context_provider.h
diff --git a/cc/test/test_context_provider.h b/cc/test/test_context_provider.h
index d7c5627f4781e5f13a47704a8c73cb90f37517a6..97c7abcd3b5bae42affb7ad1b768e9e2723f58fb 100644
--- a/cc/test/test_context_provider.h
+++ b/cc/test/test_context_provider.h
@@ -36,9 +36,6 @@
   static scoped_refptr<TestContextProvider> Create(
       std::unique_ptr<TestWebGraphicsContext3D> context);
   static scoped_refptr<TestContextProvider> Create(
-      std::unique_ptr<TestWebGraphicsContext3D> context,
-      std::unique_ptr<TestContextSupport> support);
-  static scoped_refptr<TestContextProvider> Create(
       std::unique_ptr<TestGLES2Interface> gl);
 
   bool BindToCurrentThread() override;
@@ -60,11 +57,10 @@
   // InitializeOnCurrentThread on the context returned from this method.
   TestWebGraphicsContext3D* UnboundTestContext3d();
 
-  TestContextSupport* support() { return support_.get(); }
+  TestContextSupport* support() { return &support_; }
 
  protected:
   explicit TestContextProvider(
-      std::unique_ptr<TestContextSupport> support,
       std::unique_ptr<TestGLES2Interface> gl,
       std::unique_ptr<TestWebGraphicsContext3D> context);
   ~TestContextProvider() override;
@@ -72,10 +68,11 @@
  private:
   void OnLostContext();
 
-  std::unique_ptr<TestContextSupport> support_;
+  TestContextSupport support_;
+
   std::unique_ptr<TestWebGraphicsContext3D> context3d_;
   std::unique_ptr<TestGLES2Interface> context_gl_;
-  bool bound_ = false;
+  bool bound_;
 
   base::ThreadChecker main_thread_checker_;
   base::ThreadChecker context_thread_checker_;