Defer compositor context creation to the thread.

cc/test/test_in_process_context_provider.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_TEST_IN_PROCESS_CONTEXT_PROVIDER_H_
 #define CC_TEST_TEST_IN_PROCESS_CONTEXT_PROVIDER_H_
 
 #include <stdint.h>
 
 #include <memory>
 
+#include "base/macros.h"
 #include "base/synchronization/lock.h"
 #include "cc/output/context_provider.h"
 #include "cc/test/test_gpu_memory_buffer_manager.h"
 #include "cc/test/test_image_factory.h"
 
 class GrContext;
 
 namespace gpu {
 class GLInProcessContext;
 }
 
 namespace skia_bindings {
 class GrContextForGLES2Interface;
 }
 
 namespace cc {
 
 std::unique_ptr<gpu::GLInProcessContext> CreateTestInProcessContext();
 std::unique_ptr<gpu::GLInProcessContext> CreateTestInProcessContext(
     TestGpuMemoryBufferManager* gpu_memory_buffer_manager,
     TestImageFactory* image_factory,
     gpu::GLInProcessContext* shared_context);
 
 class TestInProcessContextProvider : public ContextProvider {
  public:
   explicit TestInProcessContextProvider(
       TestInProcessContextProvider* shared_context);
 
-  bool BindToCurrentThread() override;
+  class Factory : public ContextProvider::Factory {
+   public:
+    explicit Factory(TestInProcessContextProvider* shared_context)
+        : shared_context_(shared_context) {}
+    scoped_refptr<ContextProvider> CreateContext() override;
+
+   private:
+    TestInProcessContextProvider* const shared_context_;
+
+    DISALLOW_COPY_AND_ASSIGN(Factory);
+  };
+
   gpu::gles2::GLES2Interface* ContextGL() override;
   gpu::ContextSupport* ContextSupport() override;
   class GrContext* GrContext() override;
   void InvalidateGrContext(uint32_t state) override;
   base::Lock* GetLock() override;
   gpu::Capabilities ContextCapabilities() override;
   void DeleteCachedResources() override;
   void SetLostContextCallback(
       const LostContextCallback& lost_context_callback) override;
 
  protected:
   friend class base::RefCountedThreadSafe<TestInProcessContextProvider>;
   ~TestInProcessContextProvider() override;
 
  private:
   TestGpuMemoryBufferManager gpu_memory_buffer_manager_;
   TestImageFactory image_factory_;
   std::unique_ptr<gpu::GLInProcessContext> context_;
   std::unique_ptr<skia_bindings::GrContextForGLES2Interface> gr_context_;
   base::Lock context_lock_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_TEST_IN_PROCESS_CONTEXT_PROVIDER_H_