Support multiple service instances with GLInProcessContext

content/browser/android/in_process/synchronous_compositor_factory_impl.h

Index: content/browser/android/in_process/synchronous_compositor_factory_impl.h
diff --git a/content/browser/android/in_process/synchronous_compositor_factory_impl.h b/content/browser/android/in_process/synchronous_compositor_factory_impl.h
index 1e7987fc5a9a53340e3002ccf24d83b9de93d745..f6340ceb89750a4433e2cb5737fed9a3494126fa 100644
--- a/content/browser/android/in_process/synchronous_compositor_factory_impl.h
+++ b/content/browser/android/in_process/synchronous_compositor_factory_impl.h
@@ -53,14 +53,18 @@ class SynchronousCompositorFactoryImpl : public SynchronousCompositorFactory {
 
   void CompositorInitializedHardwareDraw();
   void CompositorReleasedHardwareDraw();
+  gpu::GLInProcessContext* GetCompositorShareGroup() {
+    return wrapped_gl_context_for_compositor_thread_;
+  }
 
  private:
   void ReleaseGlobalHardwareResources();
   bool CanCreateMainThreadContext();
   scoped_refptr<StreamTextureFactorySynchronousImpl::ContextProvider>
       TryCreateStreamTextureFactory();
-  scoped_ptr<webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl>
-      CreateOffscreenContext();
+  scoped_ptr<gpu::GLInProcessContext> CreateOffscreenContext();
+  scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> WrapContext(
+      scoped_ptr<gpu::GLInProcessContext> context);
 
   SynchronousInputEventFilter synchronous_input_event_filter_;
 
@@ -72,6 +76,7 @@ class SynchronousCompositorFactoryImpl : public SynchronousCompositorFactory {
   // This is a pointer to the context owned by
   // |offscreen_context_for_main_thread_|.
   gpu::GLInProcessContext* wrapped_gl_context_for_main_thread_;
+  gpu::GLInProcessContext* wrapped_gl_context_for_compositor_thread_;
   scoped_refptr<cc::ContextProvider> offscreen_context_for_compositor_thread_;
 
   // |num_hardware_compositor_lock_| is updated on UI thread only but can be