Defer compositor context creation to the thread.

cc/resources/resource_provider_unittest.cc

 // Copyright 2012 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/resources/resource_provider.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 409 matching lines @@
         context3d_(NULL),
         child_context_(NULL),
         main_thread_task_runner_(BlockingTaskRunner::Create(NULL)) {
     switch (GetParam()) {
       case ResourceProvider::RESOURCE_TYPE_GPU_MEMORY_BUFFER:
       case ResourceProvider::RESOURCE_TYPE_GL_TEXTURE: {
         std::unique_ptr<ResourceProviderContext> context3d(
             ResourceProviderContext::Create(shared_data_.get()));
         context3d_ = context3d.get();
 
-        scoped_refptr<TestContextProvider> context_provider =
-            TestContextProvider::Create(std::move(context3d));
-
-        output_surface_ = FakeOutputSurface::Create3d(context_provider);
+        output_surface_ = FakeOutputSurface::Create3d(
+            base::MakeUnique<TestContextProvider::Factory>(
+                std::move(context3d)));
 
         std::unique_ptr<ResourceProviderContext> child_context_owned =
             ResourceProviderContext::Create(shared_data_.get());
         child_context_ = child_context_owned.get();
         if (child_needs_sync_token) {
           child_output_surface_ =
               FakeOutputSurface::Create3d(std::move(child_context_owned));
         } else {
           child_output_surface_ = FakeOutputSurface::CreateNoRequireSyncPoint(
               std::move(child_context_owned));
@@ skipping 3246 matching lines @@
   EXPECT_TRUE(resource_provider_->CanLockForWrite(id));
   EXPECT_FALSE(resource_provider_->InUseByConsumer(id));
   gpu_memory_buffer_manager_->SetGpuMemoryBufferIsInUseByMacOSWindowServer(
       gpu_memory_buffer, true);
   EXPECT_FALSE(resource_provider_->CanLockForWrite(id));
   EXPECT_TRUE(resource_provider_->InUseByConsumer(id));
 }
 
 }  // namespace
 }  // namespace cc