Share SyncPointManager between ipc and in-process

content/gpu/in_process_gpu_thread.h

Index: content/gpu/in_process_gpu_thread.h
diff --git a/content/gpu/in_process_gpu_thread.h b/content/gpu/in_process_gpu_thread.h
index 37167303fd128d3d4fc96d436eb29395040770f0..6516ba6ae8a71f0de26b0e00382b87b2167e87c9 100644
--- a/content/gpu/in_process_gpu_thread.h
+++ b/content/gpu/in_process_gpu_thread.h
@@ -9,6 +9,10 @@
 #include "content/common/content_export.h"
 #include "content/common/in_process_child_thread_params.h"
 
+namespace gpu {
+class SyncPointManager;
+}
+
 namespace content {
 
 class GpuMemoryBufferFactory;
@@ -18,7 +22,8 @@ class GpuProcess;
 // with --in-process-gpu or --single-process.
 class InProcessGpuThread : public base::Thread {
  public:
-  InProcessGpuThread(const InProcessChildThreadParams& params);
+  InProcessGpuThread(const InProcessChildThreadParams& params,
+                     gpu::SyncPointManager* sync_point_manager_override);
   ~InProcessGpuThread() override;
 
  protected:
@@ -31,6 +36,12 @@ class InProcessGpuThread : public base::Thread {
   // Deleted in CleanUp() on the gpu thread, so don't use smart pointers.
   GpuProcess* gpu_process_;
 
+  // Can be null if overridden.
+  scoped_ptr<gpu::SyncPointManager> sync_point_manager_;
+
+  // Non-owning.
+  gpu::SyncPointManager* sync_point_manager_override_;
+
   scoped_ptr<GpuMemoryBufferFactory> gpu_memory_buffer_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(InProcessGpuThread);