aura: Allow in process ContextProvider to hold onscreen contexts.

cc/test/layer_tree_pixel_test.cc

 // Copyright 2013 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/test/layer_tree_pixel_test.h"
 
 #include "base/path_service.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/texture_layer.h"
 #include "cc/output/copy_output_request.h"
@@ skipping 36 matching lines @@
               software_output_device.PassAs<SoftwareOutputDevice>()));
       break;
     }
 
     case GL_WITH_DEFAULT:
     case GL_WITH_BITMAP: {
       CHECK(gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL));
 
       using WebKit::WebGraphicsContext3D;
       using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl;
-      output_surface = make_scoped_ptr(new PixelTestOutputSurface(
+      scoped_ptr<WebGraphicsContext3D> context(
           WebGraphicsContext3DInProcessCommandBufferImpl::
-              CreateOffscreenContext(WebGraphicsContext3D::Attributes())));
+              CreateOffscreenContext(WebGraphicsContext3D::Attributes()));
+      output_surface.reset(new PixelTestOutputSurface(context.Pass()));
       break;
     }
   }
 
   output_surface->set_viewport_offset(viewport_offset);
   output_surface->set_surface_expansion_size(surface_expansion_size);
   return output_surface.PassAs<OutputSurface>();
 }
 
 scoped_refptr<cc::ContextProvider>
 LayerTreePixelTest::OffscreenContextProviderForMainThread() {
   scoped_refptr<webkit::gpu::ContextProviderInProcess> provider =
-      webkit::gpu::ContextProviderInProcess::Create();
+      webkit::gpu::ContextProviderInProcess::CreateOffscreen();
   CHECK(provider->BindToCurrentThread());
   return provider;
 }
 
 scoped_refptr<cc::ContextProvider>
 LayerTreePixelTest::OffscreenContextProviderForCompositorThread() {
   scoped_refptr<webkit::gpu::ContextProviderInProcess> provider =
-      webkit::gpu::ContextProviderInProcess::Create();
+      webkit::gpu::ContextProviderInProcess::CreateOffscreen();
   CHECK(provider.get());
   return provider;
 }
 
 scoped_ptr<CopyOutputRequest> LayerTreePixelTest::CreateCopyOutputRequest() {
   return CopyOutputRequest::CreateBitmapRequest(
       base::Bind(&LayerTreePixelTest::ReadbackResult, base::Unretained(this)));
 }
 
 void LayerTreePixelTest::ReadbackResult(scoped_ptr<CopyOutputResult> result) {
@@ skipping 278 matching lines @@
   return TextureMailbox(
       mailbox,
       base::Bind(&LayerTreePixelTest::ReleaseTextureMailbox,
                  base::Unretained(this),
                  base::Passed(&context3d),
                  texture_id),
       sync_point);
 }
 
 }  // namespace cc