Make browser GPU channel creation async.

ui/compositor/test/in_process_context_factory.cc

 // Copyright 2014 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 "ui/compositor/test/in_process_context_factory.h"
 
 #include "base/command_line.h"
 #include "base/threading/thread.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "cc/test/pixel_test_output_surface.h"
@@ skipping 21 matching lines @@
   bool use_thread = false;
 #endif
   if (use_thread) {
     compositor_thread_.reset(new base::Thread("Browser Compositor"));
     compositor_thread_->Start();
   }
 }
 
 InProcessContextFactory::~InProcessContextFactory() {}
 
-scoped_ptr<cc::OutputSurface> InProcessContextFactory::CreateOutputSurface(
-    Compositor* compositor,
+void InProcessContextFactory::CreateOutputSurface(
+    base::WeakPtr<Compositor> compositor,
     bool software_fallback) {
   DCHECK(!software_fallback);
   blink::WebGraphicsContext3D::Attributes attrs;
   attrs.depth = false;
   attrs.stencil = false;
   attrs.antialias = false;
   attrs.shareResources = true;
   bool lose_context_when_out_of_memory = true;
 
   using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl;
   scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context3d(
       WebGraphicsContext3DInProcessCommandBufferImpl::CreateViewContext(
           attrs, lose_context_when_out_of_memory, compositor->widget()));
   CHECK(context3d);
 
   using webkit::gpu::ContextProviderInProcess;
   scoped_refptr<ContextProviderInProcess> context_provider =
       ContextProviderInProcess::Create(context3d.Pass(), "UICompositor");
 
-  return make_scoped_ptr(new cc::PixelTestOutputSurface(context_provider));
+  compositor->SetOutputSurface(
+      make_scoped_ptr(new cc::PixelTestOutputSurface(context_provider)));
 }
 
 scoped_refptr<Reflector> InProcessContextFactory::CreateReflector(
     Compositor* mirroed_compositor,
     Layer* mirroring_layer) {
   return new Reflector();
 }
 
 void InProcessContextFactory::RemoveReflector(
     scoped_refptr<Reflector> reflector) {}
@@ skipping 34 matching lines @@
   return compositor_thread_->message_loop_proxy().get();
 }
 
 scoped_ptr<cc::SurfaceIdAllocator>
 InProcessContextFactory::CreateSurfaceIdAllocator() {
   return make_scoped_ptr(
       new cc::SurfaceIdAllocator(next_surface_id_namespace_++));
 }
 
 }  // namespace ui