Defer compositor context creation to the thread.

cc/surfaces/display_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/display.h"
 
 #include <utility>
 
 #include "base/test/null_task_runner.h"
 #include "cc/output/compositor_frame.h"
@@ skipping 49 matching lines @@
         id_allocator_(kArbitrarySurfaceNamespace),
         software_output_device_(nullptr),
         task_runner_(new base::NullTaskRunner) {
     id_allocator_.RegisterSurfaceIdNamespace(&manager_);
   }
 
  protected:
   void SetUpContext(std::unique_ptr<TestWebGraphicsContext3D> context) {
     if (context) {
       output_surface_ = FakeOutputSurface::Create3d(
-          TestContextProvider::Create(std::move(context)));
+          base::MakeUnique<TestContextProvider::Factory>(std::move(context)));
     } else {
       std::unique_ptr<TestSoftwareOutputDevice> output_device(
           new TestSoftwareOutputDevice);
       software_output_device_ = output_device.get();
       output_surface_ =
           FakeOutputSurface::CreateSoftware(std::move(output_device));
     }
     shared_bitmap_manager_.reset(new TestSharedBitmapManager);
     output_surface_ptr_ = output_surface_.get();
   }
@@ skipping 428 matching lines @@
 
   EXPECT_CALL(*context_ptr, shallowFinishCHROMIUM());
   display.Resize(gfx::Size(250, 250));
   testing::Mock::VerifyAndClearExpectations(context_ptr);
 
   factory_.Destroy(surface_id);
 }
 
 }  // namespace
 }  // namespace cc