Defer compositor context creation to the thread.

cc/surfaces/surface_display_output_surface_unittest.cc

 // Copyright 2015 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/surfaces/surface_display_output_surface.h"
 
 #include <memory>
 
 #include "cc/surfaces/onscreen_display_client.h"
 #include "cc/surfaces/surface_id_allocator.h"
@@ skipping 45 matching lines @@
         task_runner_(new OrderedSimpleTaskRunner(now_src_.get(), true)),
         allocator_(0),
         display_size_(1920, 1080),
         display_rect_(display_size_),
         display_client_(&surface_manager_,
                         &bitmap_manager_,
                         &gpu_memory_buffer_manager_,
                         renderer_settings_,
                         task_runner_,
                         allocator_.id_namespace()),
-        context_provider_(TestContextProvider::Create()),
-        surface_display_output_surface_(&surface_manager_,
-                                        &allocator_,
-                                        context_provider_,
-                                        nullptr) {
+        surface_display_output_surface_(
+            &surface_manager_,
+            &allocator_,
+            base::MakeUnique<TestContextProvider::Factory>(),
+            nullptr) {
     surface_manager_.RegisterSurfaceIdNamespace(allocator_.id_namespace());
     output_surface_ = display_client_.output_surface();
     display_client_.set_surface_output_surface(
         &surface_display_output_surface_);
     surface_display_output_surface_.set_display_client(&display_client_);
 
     // Set the Display's begin frame source like a real browser compositor
     // output surface would.
     begin_frame_source_.reset(
         new BackToBackBeginFrameSource(task_runner_.get()));
@@ skipping 41 matching lines @@
 
   const gfx::Size display_size_;
   const gfx::Rect display_rect_;
   FakeOutputSurface* output_surface_;
   SurfaceManager surface_manager_;
   TestSharedBitmapManager bitmap_manager_;
   TestGpuMemoryBufferManager gpu_memory_buffer_manager_;
   RendererSettings renderer_settings_;
   FakeOnscreenDisplayClient display_client_;
 
-  scoped_refptr<TestContextProvider> context_provider_;
-
   FakeOutputSurfaceClient surface_display_output_surface_client_;
   SurfaceDisplayOutputSurface surface_display_output_surface_;
 };
 
 TEST_F(SurfaceDisplayOutputSurfaceTest, DamageTriggersSwapBuffers) {
   SwapBuffersWithDamage(display_rect_);
   EXPECT_EQ(1u, output_surface_->num_sent_frames());
   task_runner_->RunUntilIdle();
   EXPECT_EQ(2u, output_surface_->num_sent_frames());
 }
@@ skipping 28 matching lines @@
   EXPECT_EQ(1u, output_surface_->num_sent_frames());
 
   SwapBuffersWithDamage(gfx::Rect());
   EXPECT_EQ(1u, output_surface_->num_sent_frames());
   task_runner_->RunUntilIdle();
   EXPECT_EQ(1u, output_surface_->num_sent_frames());
 }
 
 }  // namespace
 }  // namespace cc