Support multiple service instances with GLInProcessContext

content/browser/android/in_process/synchronous_compositor_output_surface.cc

Index: content/browser/android/in_process/synchronous_compositor_output_surface.cc
diff --git a/content/browser/android/in_process/synchronous_compositor_output_surface.cc b/content/browser/android/in_process/synchronous_compositor_output_surface.cc
index cb237f0153041d04250cc0049a76d75354c1008a..c7a27c601552cbe2755b00e7ff563bf6a1438f7a 100644
--- a/content/browser/android/in_process/synchronous_compositor_output_surface.cc
+++ b/content/browser/android/in_process/synchronous_compositor_output_surface.cc
@@ -30,7 +30,9 @@ namespace content {
 namespace {
 
 scoped_ptr<webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl>
-CreateWebGraphicsContext3D(scoped_refptr<gfx::GLSurface> surface) {
+CreateWebGraphicsContext3D(
+    scoped_refptr<gfx::GLSurface> surface,
+    scoped_refptr<gpu::InProcessCommandBuffer::Service> service) {
   using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl;
   const gfx::GpuPreference gpu_preference = gfx::PreferDiscreteGpu;
 
@@ -44,6 +46,7 @@ CreateWebGraphicsContext3D(scoped_refptr<gfx::GLSurface> surface) {
       attributes, &in_process_attribs);
   scoped_ptr<gpu::GLInProcessContext> context(
       gpu::GLInProcessContext::CreateWithSurface(surface,
+                                                 service,
                                                  attributes.shareResources,
                                                  in_process_attribs,
                                                  gpu_preference));
@@ -191,6 +194,7 @@ void AdjustTransform(gfx::Transform* transform, gfx::Rect viewport) {
 
 bool SynchronousCompositorOutputSurface::InitializeHwDraw(
     scoped_refptr<gfx::GLSurface> surface,
+    scoped_refptr<gpu::InProcessCommandBuffer::Service> service,
     scoped_refptr<cc::ContextProvider> offscreen_context_provider) {
   DCHECK(CalledOnValidThread());
   DCHECK(HasClient());
@@ -199,7 +203,7 @@ bool SynchronousCompositorOutputSurface::InitializeHwDraw(
 
   scoped_refptr<cc::ContextProvider> onscreen_context_provider =
       webkit::gpu::ContextProviderInProcess::Create(
-          CreateWebGraphicsContext3D(surface), "SynchronousCompositor");
+          CreateWebGraphicsContext3D(surface, service), "SynchronousCompositor");
   return InitializeAndSetContext3d(onscreen_context_provider,
                                    offscreen_context_provider);
 }