| Index: content/common/gpu/gpu_channel_test_common.cc
|
| diff --git a/content/common/gpu/gpu_channel_test_common.cc b/content/common/gpu/gpu_channel_test_common.cc
|
| index 527c740357a58a7151c50297db3867c5e0a50943..6001d766c620a0040472343513c763f6b558aabf 100644
|
| --- a/content/common/gpu/gpu_channel_test_common.cc
|
| +++ b/content/common/gpu/gpu_channel_test_common.cc
|
| @@ -11,13 +11,21 @@
|
|
|
| namespace content {
|
|
|
| +TestGpuChannelManagerDelegate::TestGpuChannelManagerDelegate() {}
|
| +
|
| +TestGpuChannelManagerDelegate::~TestGpuChannelManagerDelegate() {}
|
| +
|
| +void TestGpuChannelManagerDelegate::SetActiveURL(const std::string& url) {}
|
| +
|
| TestGpuChannelManager::TestGpuChannelManager(
|
| IPC::TestSink* sink,
|
| + GpuChannelManagerDelegate* delegate,
|
| base::SingleThreadTaskRunner* task_runner,
|
| base::SingleThreadTaskRunner* io_task_runner,
|
| gpu::SyncPointManager* sync_point_manager,
|
| GpuMemoryBufferFactory* gpu_memory_buffer_factory)
|
| - : GpuChannelManager(nullptr,
|
| + : GpuChannelManager(delegate,
|
| + nullptr,
|
| nullptr,
|
| task_runner,
|
| io_task_runner,
|
| @@ -96,16 +104,20 @@ bool TestGpuChannel::Send(IPC::Message* msg) {
|
| }
|
|
|
| // TODO(sunnyps): Use a mock memory buffer factory when necessary.
|
| +
|
| GpuChannelTestCommon::GpuChannelTestCommon()
|
| : sink_(new IPC::TestSink),
|
| task_runner_(new base::TestSimpleTaskRunner),
|
| io_task_runner_(new base::TestSimpleTaskRunner),
|
| sync_point_manager_(new gpu::SyncPointManager(false)),
|
| - channel_manager_(new TestGpuChannelManager(sink_.get(),
|
| - task_runner_.get(),
|
| - io_task_runner_.get(),
|
| - sync_point_manager_.get(),
|
| - nullptr)) {}
|
| + channel_manager_delegate_(new TestGpuChannelManagerDelegate()),
|
| + channel_manager_(
|
| + new TestGpuChannelManager(sink_.get(),
|
| + channel_manager_delegate_.get(),
|
| + task_runner_.get(),
|
| + io_task_runner_.get(),
|
| + sync_point_manager_.get(),
|
| + nullptr)) {}
|
|
|
| GpuChannelTestCommon::~GpuChannelTestCommon() {}
|
|
|
|
|