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

cc/test/test_context_provider.cc

 // 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.
 
 #include "cc/test/test_context_provider.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <set>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "cc/test/test_gles2_interface.h"
 #include "cc/test/test_web_graphics_context_3d.h"
 #include "third_party/skia/include/gpu/GrContext.h"
 #include "third_party/skia/include/gpu/gl/GrGLInterface.h"
 
 namespace cc {
 
 // static
 scoped_refptr<TestContextProvider> TestContextProvider::Create() {
-  return new TestContextProvider(base::MakeUnique<TestContextSupport>(),
-                                 base::MakeUnique<TestGLES2Interface>(),
-                                 TestWebGraphicsContext3D::Create());
+  return Create(TestWebGraphicsContext3D::Create());
 }
 
 // static
 scoped_refptr<TestContextProvider> TestContextProvider::CreateWorker() {
-  scoped_refptr<TestContextProvider> worker_context_provider(
-      new TestContextProvider(base::MakeUnique<TestContextSupport>(),
-                              base::MakeUnique<TestGLES2Interface>(),
-                              TestWebGraphicsContext3D::Create()));
+  scoped_refptr<TestContextProvider> worker_context_provider =
+      Create(TestWebGraphicsContext3D::Create());
   // Worker contexts are bound to the thread they are created on.
   if (!worker_context_provider->BindToCurrentThread())
     return nullptr;
   return worker_context_provider;
 }
 
 // static
 scoped_refptr<TestContextProvider> TestContextProvider::Create(
     std::unique_ptr<TestWebGraphicsContext3D> context) {
   DCHECK(context);
-  return new TestContextProvider(base::MakeUnique<TestContextSupport>(),
-                                 base::MakeUnique<TestGLES2Interface>(),
+  return new TestContextProvider(base::MakeUnique<TestGLES2Interface>(),
                                  std::move(context));
 }
 
 // static
 scoped_refptr<TestContextProvider> TestContextProvider::Create(
     std::unique_ptr<TestGLES2Interface> gl) {
   DCHECK(gl);
-  return new TestContextProvider(base::MakeUnique<TestContextSupport>(),
-                                 std::move(gl),
+  return new TestContextProvider(std::move(gl),
                                  TestWebGraphicsContext3D::Create());
 }
 
-// static
-scoped_refptr<TestContextProvider> TestContextProvider::Create(
-    std::unique_ptr<TestWebGraphicsContext3D> context,
-    std::unique_ptr<TestContextSupport> support) {
-  DCHECK(context);
-  DCHECK(support);
-  return new TestContextProvider(std::move(support),
-                                 base::MakeUnique<TestGLES2Interface>(),
-                                 std::move(context));
-}
-
 TestContextProvider::TestContextProvider(
-    std::unique_ptr<TestContextSupport> support,
     std::unique_ptr<TestGLES2Interface> gl,
     std::unique_ptr<TestWebGraphicsContext3D> context)
-    : support_(std::move(support)),
-      context3d_(std::move(context)),
+    : context3d_(std::move(context)),
       context_gl_(std::move(gl)),
+      bound_(false),
       weak_ptr_factory_(this) {
   DCHECK(main_thread_checker_.CalledOnValidThread());
   DCHECK(context3d_);
   DCHECK(context_gl_);
   context_thread_checker_.DetachFromThread();
   context_gl_->set_test_context(context3d_.get());
-  context3d_->set_test_support(support_.get());
+  context3d_->set_test_support(&support_);
 }
 
 TestContextProvider::~TestContextProvider() {
   DCHECK(main_thread_checker_.CalledOnValidThread() ||
          context_thread_checker_.CalledOnValidThread());
 }
 
 bool TestContextProvider::BindToCurrentThread() {
   // This is called on the thread the context will be used.
   DCHECK(context_thread_checker_.CalledOnValidThread());
@@ skipping 25 matching lines @@
 
 gpu::gles2::GLES2Interface* TestContextProvider::ContextGL() {
   DCHECK(context3d_);
   DCHECK(bound_);
   DCHECK(context_thread_checker_.CalledOnValidThread());
 
   return context_gl_.get();
 }
 
 gpu::ContextSupport* TestContextProvider::ContextSupport() {
-  return support();
+  return &support_;
 }
 
 class GrContext* TestContextProvider::GrContext() {
   DCHECK(bound_);
   DCHECK(context_thread_checker_.CalledOnValidThread());
 
   if (gr_context_)
     return gr_context_.get();
 
   sk_sp<const GrGLInterface> gl_interface(GrGLCreateNullInterface());
@@ skipping 43 matching lines @@
 }
 
 void TestContextProvider::SetLostContextCallback(
     const LostContextCallback& cb) {
   DCHECK(context_thread_checker_.CalledOnValidThread());
   DCHECK(lost_context_callback_.is_null() || cb.is_null());
   lost_context_callback_ = cb;
 }
 
 }  // namespace cc