Share SyncPointManager between ipc and in-process

components/view_manager/gles2/command_buffer_impl.h

Index: components/view_manager/gles2/command_buffer_impl.h
diff --git a/components/view_manager/gles2/command_buffer_impl.h b/components/view_manager/gles2/command_buffer_impl.h
index 2961d949f6ff1b5acdae72917b3560ea46b31527..7ae43a8ef17d0aaacdde39b03ad6858cf2985d8a 100644
--- a/components/view_manager/gles2/command_buffer_impl.h
+++ b/components/view_manager/gles2/command_buffer_impl.h
@@ -18,6 +18,7 @@ class SyncPointManager;
 namespace gles2 {
 class CommandBufferDriver;
 class CommandBufferImplObserver;
+class GpuState;
 
 // This class listens to the CommandBuffer message pipe on a low-latency thread
 // so that we can insert sync points without blocking on the GL driver. It
@@ -25,12 +26,10 @@ class CommandBufferImplObserver;
 // same thread as the native viewport.
 class CommandBufferImpl : public mojo::CommandBuffer {
  public:
-  CommandBufferImpl(
-      mojo::InterfaceRequest<CommandBuffer> request,
-      mojo::ViewportParameterListenerPtr listener,
-      scoped_refptr<base::SingleThreadTaskRunner> control_task_runner,
-      gpu::SyncPointManager* sync_point_manager,
-      scoped_ptr<CommandBufferDriver> driver);
+  CommandBufferImpl(mojo::InterfaceRequest<CommandBuffer> request,
+                    mojo::ViewportParameterListenerPtr listener,
+                    scoped_refptr<GpuState> gpu_state,
+                    scoped_ptr<CommandBufferDriver> driver);
 
   // mojo::CommandBuffer:
   void Initialize(mojo::CommandBufferSyncClientPtr sync_client,
@@ -75,7 +74,7 @@ class CommandBufferImpl : public mojo::CommandBuffer {
 
   void OnConnectionError();
 
-  scoped_refptr<gpu::SyncPointManager> sync_point_manager_;
+  scoped_refptr<GpuState> gpu_state_;
   scoped_refptr<base::SingleThreadTaskRunner> driver_task_runner_;
   scoped_ptr<CommandBufferDriver> driver_;
   mojo::CommandBufferSyncPointClientPtr sync_point_client_;