Share SyncPointManager between ipc and in-process

content/gpu/gpu_child_thread.h

Index: content/gpu/gpu_child_thread.h
diff --git a/content/gpu/gpu_child_thread.h b/content/gpu/gpu_child_thread.h
index a9ed8b956c665d0be7fe80ab72fbc330233be654..242ff8115865623e413c2f7578d98e0302c41980 100644
--- a/content/gpu/gpu_child_thread.h
+++ b/content/gpu/gpu_child_thread.h
@@ -22,6 +22,10 @@
 #include "gpu/config/gpu_info.h"
 #include "ui/gfx/native_widget_types.h"
 
+namespace gpu {
+class SyncPointManager;
+}
+
 namespace sandbox {
 class TargetServices;
 }
@@ -42,10 +46,12 @@ class GpuChildThread : public ChildThreadImpl {
                  bool dead_on_arrival,
                  const gpu::GPUInfo& gpu_info,
                  const DeferredMessages& deferred_messages,
-                 GpuMemoryBufferFactory* gpu_memory_buffer_factory);
+                 GpuMemoryBufferFactory* gpu_memory_buffer_factory,
+                 gpu::SyncPointManager* sync_point_manager);
 
   GpuChildThread(const InProcessChildThreadParams& params,
-                 GpuMemoryBufferFactory* gpu_memory_buffer_factory);
+                 GpuMemoryBufferFactory* gpu_memory_buffer_factory,
+                 gpu::SyncPointManager* sync_point_manager);
 
   ~GpuChildThread() override;
 
@@ -88,6 +94,9 @@ class GpuChildThread : public ChildThreadImpl {
   sandbox::TargetServices* target_services_;
 #endif
 
+  // Non-owning.
+  gpu::SyncPointManager* sync_point_manager_;
+
   scoped_ptr<GpuChannelManager> gpu_channel_manager_;
 
   // Information about the GPU, such as device and vendor ID.