Defer compositor context creation to the thread.

cc/test/fake_output_surface.cc

Index: cc/test/fake_output_surface.cc
diff --git a/cc/test/fake_output_surface.cc b/cc/test/fake_output_surface.cc
index f1b59b4ee9a75d28b27833236c98cbff703a55ac..e67147fa4ff8253a1712cdaf5f5c4c0c42ca9a8c 100644
--- a/cc/test/fake_output_surface.cc
+++ b/cc/test/fake_output_surface.cc
@@ -15,10 +15,11 @@
 namespace cc {
 
 FakeOutputSurface::FakeOutputSurface(
-    scoped_refptr<ContextProvider> context_provider,
+    std::unique_ptr<ContextProvider::DeferredCreate> context_provider_create,
     scoped_refptr<ContextProvider> worker_context_provider,
     bool delegated_rendering)
-    : OutputSurface(context_provider, worker_context_provider),
+    : OutputSurface(std::move(context_provider_create),
+                    std::move(worker_context_provider)),
       client_(NULL),
       num_sent_frames_(0),
       has_external_stencil_test_(false),
@@ -29,9 +30,9 @@ FakeOutputSurface::FakeOutputSurface(
 }
 
 FakeOutputSurface::FakeOutputSurface(
-    scoped_refptr<ContextProvider> context_provider,
+    std::unique_ptr<ContextProvider::DeferredCreate> context_provider_create,
     bool delegated_rendering)
-    : OutputSurface(context_provider),
+    : OutputSurface(std::move(context_provider_create)),
       client_(NULL),
       num_sent_frames_(0),
       has_external_stencil_test_(false),
@@ -55,10 +56,11 @@ FakeOutputSurface::FakeOutputSurface(
 }
 
 FakeOutputSurface::FakeOutputSurface(
-    scoped_refptr<ContextProvider> context_provider,
+    std::unique_ptr<ContextProvider::DeferredCreate> context_provider_create,
     std::unique_ptr<SoftwareOutputDevice> software_device,
     bool delegated_rendering)
-    : OutputSurface(context_provider, std::move(software_device)),
+    : OutputSurface(std::move(context_provider_create),
+                    std::move(software_device)),
       client_(NULL),
       num_sent_frames_(0),
       has_external_stencil_test_(false),