Share SyncPointManager between ipc and in-process

content/common/gpu/gpu_channel_manager.h

Index: content/common/gpu/gpu_channel_manager.h
diff --git a/content/common/gpu/gpu_channel_manager.h b/content/common/gpu/gpu_channel_manager.h
index 733081b4b45e4d555bd60e8fa5665d09b8372211..2bbca8b9d88425921727d68cacc60e1f1856770e 100644
--- a/content/common/gpu/gpu_channel_manager.h
+++ b/content/common/gpu/gpu_channel_manager.h
@@ -68,6 +68,7 @@ class CONTENT_EXPORT GpuChannelManager : public IPC::Listener,
                     base::WaitableEvent* shutdown_event,
                     IPC::SyncChannel* channel,
                     IPC::AttachmentBroker* broker,
+                    gpu::SyncPointManager* sync_point_manager,
                     GpuMemoryBufferFactory* gpu_memory_buffer_factory);
   ~GpuChannelManager() override;
 
@@ -97,7 +98,7 @@ class CONTENT_EXPORT GpuChannelManager : public IPC::Listener,
   GpuChannel* LookupChannel(int32 client_id);
 
   gpu::SyncPointManager* sync_point_manager() {
-    return sync_point_manager_.get();
+    return sync_point_manager_;
   }
 
   gfx::GLSurface* GetDefaultOffscreenSurface();
@@ -153,7 +154,8 @@ class CONTENT_EXPORT GpuChannelManager : public IPC::Listener,
   scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_;
   GpuMemoryManager gpu_memory_manager_;
   GpuWatchdog* watchdog_;
-  scoped_refptr<gpu::SyncPointManager> sync_point_manager_;
+  // SyncPointManager guaranteed to outlive running MessageLoop.
+  gpu::SyncPointManager* sync_point_manager_;
   scoped_ptr<gpu::gles2::ProgramCache> program_cache_;
   scoped_refptr<gpu::gles2::ShaderTranslatorCache> shader_translator_cache_;
   scoped_refptr<gfx::GLSurface> default_offscreen_surface_;