Clean up SyncCompositorFactory context creation

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 cafd6411a95a8fbd1e8f61a67ad992965b3462d8..11f99999033174a703169fee846f655defdac58e 100644
--- a/content/browser/android/in_process/synchronous_compositor_factory_impl.h
+++ b/content/browser/android/in_process/synchronous_compositor_factory_impl.h
@@ -46,11 +46,6 @@ class SynchronousCompositorFactoryImpl : public SynchronousCompositorFactory {
   virtual blink::WebGraphicsContext3D* CreateOffscreenGraphicsContext3D(
       const blink::WebGraphicsContext3D::Attributes& attributes) OVERRIDE;
 
-  // This is called on the renderer compositor impl thread (InitializeHwDraw) in
-  // order to support Android WebView synchronously enable and disable hardware
-  // mode multiple times in the same task.
-  scoped_refptr<cc::ContextProvider>
-      GetOffscreenContextProviderForCompositorThread();
 
   SynchronousInputEventFilter* synchronous_input_event_filter() {
     return &synchronous_input_event_filter_;
@@ -63,23 +58,21 @@ class SynchronousCompositorFactoryImpl : public SynchronousCompositorFactory {
 
   scoped_refptr<cc::ContextProvider>
       CreateOnscreenContextProviderForCompositorThread(
-          scoped_refptr<gfx::GLSurface> surface);
+          gfx::GLSurface* surface);
 
  private:
   bool CanCreateMainThreadContext();
   scoped_refptr<StreamTextureFactorySynchronousImpl::ContextProvider>
       TryCreateStreamTextureFactory();
+  void EnsureShareContextCreated();
 
   SynchronousInputEventFilter synchronous_input_event_filter_;
 
   scoped_refptr<webkit::gpu::ContextProviderWebContext>
       offscreen_context_for_main_thread_;
-  // This is a pointer to the context owned by
-  // |offscreen_context_for_main_thread_|.
-  gpu::GLInProcessContext* wrapped_gl_context_for_compositor_thread_;
-  scoped_refptr<cc::ContextProvider> offscreen_context_for_compositor_thread_;
 
   scoped_refptr<gpu::InProcessCommandBuffer::Service> service_;
+  scoped_ptr<gpu::GLInProcessContext> share_context_;
   scoped_refptr<StreamTextureFactorySynchronousImpl::ContextProvider>
       video_context_provider_;