Share SyncPointManager between ipc and in-process

content/common/gpu/gpu_channel_manager_unittest.cc

 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_simple_task_runner.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/gpu_channel_manager.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/common/message_router.h"
 #include "gpu/command_buffer/common/value_state.h"
 #include "gpu/command_buffer/service/gl_utils.h"
+#include "gpu/command_buffer/service/sync_point_manager.h"
 #include "gpu/command_buffer/service/valuebuffer_manager.h"
 #include "ipc/ipc_sync_channel.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::WaitableEvent;
 using gpu::gles2::ValuebufferManager;
 using gpu::ValueState;
 
 namespace IPC {
@@ skipping 79 matching lines @@
 
 class SimpleGpuClient : public IPC::SimpleWorker {
  public:
   SimpleGpuClient()
    : IPC::SimpleWorker(IPC::Channel::MODE_CLIENT, "simple_client"),
      router_(this) {
   }
 
   void Start() override {
     IPC::SimpleWorker::Start();
-    gpu_channel_manager_.reset(
-        new GpuChannelManager(&router_, NULL, ipc_thread().task_runner().get(),
-                              shutdown_event(), channel(), nullptr, nullptr));
+    sync_point_manager_.reset(new gpu::SyncPointManager(false));
+    gpu_channel_manager_.reset(new GpuChannelManager(
+        &router_, NULL, ipc_thread().task_runner().get(), shutdown_event(),
+        channel(), nullptr, sync_point_manager_.get(), nullptr));
   }
 
   void Shutdown() override {
     gpu_channel_manager_.reset();
     IPC::SimpleWorker::Shutdown();
   }
 
   GpuChannelManager* gpu_channel_manager() {
     return gpu_channel_manager_.get();
   }
 
  private:
   class SimpleMessageRouter : public MessageRouter {
    public:
     explicit SimpleMessageRouter(IPC::Sender* sender)
       : sender_(sender) {
     }
 
     bool Send(IPC::Message* msg) override { return sender_->Send(msg); }
 
    private:
     IPC::Sender* const sender_;
   };
 
   SimpleMessageRouter router_;
 
+  scoped_ptr<gpu::SyncPointManager> sync_point_manager_;
   scoped_ptr<GpuChannelManager> gpu_channel_manager_;
 };
 
 class GpuChannelManagerTest : public testing::Test {
  public:
   GpuChannelManagerTest() {}
 
   void SetUp() override {
     simple_client_.reset(new SimpleGpuClient());
     simple_server_.reset(new IPC::SimpleServer());
@@ skipping 62 matching lines @@
   const ValueState* state2 =
       pending_value_buffer_state2->GetState(GL_MOUSE_POSITION_CHROMIUM);
   ASSERT_NE(state1, state2);
 
   ASSERT_EQ(state1->int_value[0], value_state1.int_value[0]);
   ASSERT_EQ(state2->int_value[0], value_state2.int_value[0]);
   ASSERT_NE(state1->int_value[0], state2->int_value[0]);
 }
 
 }  // namespace content