Share SyncPointManager between ipc and in-process

components/view_manager/gles2/command_buffer_driver.h

Index: components/view_manager/gles2/command_buffer_driver.h
diff --git a/components/view_manager/gles2/command_buffer_driver.h b/components/view_manager/gles2/command_buffer_driver.h
index 68a1837a8e273a23244c5e4c99b2aafba3f654de..f42e51731f33dad0a047fd66f2a730869c02c543 100644
--- a/components/view_manager/gles2/command_buffer_driver.h
+++ b/components/view_manager/gles2/command_buffer_driver.h
@@ -19,21 +19,20 @@ namespace gpu {
 class CommandBufferService;
 class GpuScheduler;
 class GpuControlService;
-class SyncPointManager;
 namespace gles2 {
 class GLES2Decoder;
-class MailboxManager;
 }
 }
 
 namespace gfx {
 class GLContext;
-class GLShareGroup;
 class GLSurface;
 }
 
 namespace gles2 {
 
+class GpuState;
+
 // This class receives CommandBuffer messages on the same thread as the native
 // viewport.
 class CommandBufferDriver {
@@ -46,15 +45,12 @@ class CommandBufferDriver {
     virtual void DidLoseContext() = 0;
   };
   // Offscreen.
-  CommandBufferDriver(gfx::GLShareGroup* share_group,
-                      gpu::gles2::MailboxManager* mailbox_manager,
-                      gpu::SyncPointManager* sync_point_manager);
+  explicit CommandBufferDriver(scoped_refptr<GpuState> gpu_state);
+
   // Onscreen.
   CommandBufferDriver(
       gfx::AcceleratedWidget widget,
-      gfx::GLShareGroup* share_group,
-      gpu::gles2::MailboxManager* mailbox_manager,
-      gpu::SyncPointManager* sync_point_manager,
+      scoped_refptr<GpuState> gpu_state,
       const base::Callback<void(CommandBufferDriver*)>& destruct_callback);
   ~CommandBufferDriver();
 
@@ -104,9 +100,7 @@ class CommandBufferDriver {
   scoped_ptr<gpu::GpuScheduler> scheduler_;
   scoped_refptr<gfx::GLContext> context_;
   scoped_refptr<gfx::GLSurface> surface_;
-  scoped_refptr<gfx::GLShareGroup> share_group_;
-  scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_;
-  scoped_refptr<gpu::SyncPointManager> sync_point_manager_;
+  scoped_refptr<GpuState> gpu_state_;
 
   scoped_refptr<base::SingleThreadTaskRunner> context_lost_task_runner_;
   base::Callback<void(int32_t)> context_lost_callback_;