Defer compositor context creation to the thread.

cc/output/gl_renderer_unittest.cc

Index: cc/output/gl_renderer_unittest.cc
diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
index 0048cda6a759c6f40d7ef11f621857c9a4415527..9d2d4e934b9d528e368e45f1b44571787fe76b37 100644
--- a/cc/output/gl_renderer_unittest.cc
+++ b/cc/output/gl_renderer_unittest.cc
@@ -1139,7 +1139,8 @@ class NonReshapableOutputSurface : public FakeOutputSurface {
  public:
   explicit NonReshapableOutputSurface(
       std::unique_ptr<TestWebGraphicsContext3D> context3d)
-      : FakeOutputSurface(TestContextProvider::Create(std::move(context3d)),
+      : FakeOutputSurface(base::MakeUnique<TestContextProvider::DeferredCreate>(
+                              std::move(context3d)),
                           false) {
     surface_size_ = gfx::Size(500, 500);
   }
@@ -1762,9 +1763,8 @@ class OutputSurfaceMockContext : public TestWebGraphicsContext3D {
 class MockOutputSurface : public OutputSurface {
  public:
   MockOutputSurface()
-      : OutputSurface(TestContextProvider::Create(
-            std::unique_ptr<TestWebGraphicsContext3D>(
-                new StrictMock<OutputSurfaceMockContext>))) {
+      : OutputSurface(base::MakeUnique<TestContextProvider::DeferredCreate>(
+            base::MakeUnique<StrictMock<OutputSurfaceMockContext>>())) {
     surface_size_ = gfx::Size(100, 100);
   }
   virtual ~MockOutputSurface() {}
@@ -2083,16 +2083,19 @@ TEST_F(GLRendererTest, OverlaySyncTokensAreProcessed) {
   WaitSyncTokenCountingContext* context = context_owned.get();
 
   MockOverlayScheduler overlay_scheduler;
-  scoped_refptr<TestContextProvider> context_provider =
-      TestContextProvider::Create(std::move(context_owned));
-  context_provider->support()->SetScheduleOverlayPlaneCallback(base::Bind(
-      &MockOverlayScheduler::Schedule, base::Unretained(&overlay_scheduler)));
+  TestContextProvider* context_provider = nullptr;
+  std::unique_ptr<TestContextProvider::DeferredCreate> context_create(
+      new TestContextProvider::DeferredCreate(std::move(context_owned)));
+  context_create->created_context = &context_provider;
 
   FakeOutputSurfaceClient output_surface_client;
   std::unique_ptr<OutputSurface> output_surface(
-      FakeOutputSurface::Create3d(context_provider));
+      FakeOutputSurface::Create3d(std::move(context_create)));
   CHECK(output_surface->BindToClient(&output_surface_client));
 
+  context_provider->support()->SetScheduleOverlayPlaneCallback(base::Bind(
+      &MockOverlayScheduler::Schedule, base::Unretained(&overlay_scheduler)));
+
   std::unique_ptr<SharedBitmapManager> shared_bitmap_manager(
       new TestSharedBitmapManager());
   std::unique_ptr<ResourceProvider> resource_provider =