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..b2cf97216bda02a7bfdfd8f399f54fc72b2a0cd7 100644 |
--- a/content/common/gpu/gpu_channel_test_common.cc |
+++ b/content/common/gpu/gpu_channel_test_common.cc |
@@ -6,18 +6,57 @@ |
#include "base/test/test_simple_task_runner.h" |
#include "base/thread_task_runner_handle.h" |
+#include "content/common/gpu/gpu_channel_manager_delegate.h" |
#include "gpu/command_buffer/service/sync_point_manager.h" |
#include "ipc/ipc_test_sink.h" |
namespace content { |
+TestGpuChannelManagerDelegate::TestGpuChannelManagerDelegate() {} |
+ |
+TestGpuChannelManagerDelegate::~TestGpuChannelManagerDelegate() {} |
+ |
+void TestGpuChannelManagerDelegate::AddSubscription(int32_t client_id, |
+ unsigned int target) {} |
+ |
+void TestGpuChannelManagerDelegate::ChannelEstablished( |
+ const IPC::ChannelHandle& channel_handle) { |
+ last_established_channel_handle_ = channel_handle; |
+} |
+ |
+void TestGpuChannelManagerDelegate::DidCreateOffscreenContext( |
+ const GURL& active_url) {} |
+ |
+void TestGpuChannelManagerDelegate::DidDestroyChannel(int client_id) {} |
+ |
+void TestGpuChannelManagerDelegate::DidDestroyOffscreenContext( |
+ const GURL& active_url) {} |
+ |
+void TestGpuChannelManagerDelegate::DidLoseContext( |
+ bool offscreen, |
+ gpu::error::ContextLostReason reason, |
+ const GURL& active_url) {} |
+ |
+void TestGpuChannelManagerDelegate::GpuMemoryUmaStats( |
+ const GPUMemoryUmaStats& params) {} |
+ |
+void TestGpuChannelManagerDelegate::RemoveSubscription(int32_t client_id, |
+ unsigned int target) {} |
+ |
+void TestGpuChannelManagerDelegate::StoreShaderToDisk( |
+ int32_t client_id, |
+ const std::string& key, |
+ const std::string& shader) {} |
+ |
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, |
@@ -32,10 +71,6 @@ TestGpuChannelManager::~TestGpuChannelManager() { |
gpu_channels_.clear(); |
} |
-bool TestGpuChannelManager::Send(IPC::Message* msg) { |
- return sink_->Send(msg); |
-} |
- |
scoped_ptr<GpuChannel> TestGpuChannelManager::CreateGpuChannel( |
int client_id, |
uint64_t client_tracing_id, |
@@ -101,11 +136,14 @@ GpuChannelTestCommon::GpuChannelTestCommon() |
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() {} |