| Index: content/common/gpu/gpu_channel_test_common.h
|
| diff --git a/content/common/gpu/gpu_channel_test_common.h b/content/common/gpu/gpu_channel_test_common.h
|
| index 406f8d9bfdb80d6485dbac9c69a25610dcef5ad7..29c7af746f9dd7e806193a93cf06b49ed62f97a7 100644
|
| --- a/content/common/gpu/gpu_channel_test_common.h
|
| +++ b/content/common/gpu/gpu_channel_test_common.h
|
| @@ -7,6 +7,7 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "content/common/gpu/gpu_channel.h"
|
| #include "content/common/gpu/gpu_channel_manager.h"
|
| +#include "content/common/gpu/gpu_channel_manager_delegate.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| namespace base {
|
| @@ -21,9 +22,22 @@ namespace content {
|
|
|
| class SyncPointManager;
|
|
|
| +class TestGpuChannelManagerDelegate : public GpuChannelManagerDelegate {
|
| + public:
|
| + TestGpuChannelManagerDelegate();
|
| + ~TestGpuChannelManagerDelegate() override;
|
| +
|
| + // GpuChannelManagerDelegate implementation.
|
| + void SetActiveURL(const std::string& url) override;
|
| +
|
| + private:
|
| + DISALLOW_COPY_AND_ASSIGN(TestGpuChannelManagerDelegate);
|
| +};
|
| +
|
| class TestGpuChannelManager : public GpuChannelManager {
|
| public:
|
| TestGpuChannelManager(IPC::TestSink* sink,
|
| + GpuChannelManagerDelegate* delegate,
|
| base::SingleThreadTaskRunner* task_runner,
|
| base::SingleThreadTaskRunner* io_task_runner,
|
| gpu::SyncPointManager* sync_point_manager,
|
| @@ -87,6 +101,7 @@ class GpuChannelTestCommon : public testing::Test {
|
| scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
|
| scoped_refptr<base::TestSimpleTaskRunner> io_task_runner_;
|
| scoped_ptr<gpu::SyncPointManager> sync_point_manager_;
|
| + scoped_ptr<TestGpuChannelManagerDelegate> channel_manager_delegate_;
|
| scoped_ptr<GpuChannelManager> channel_manager_;
|
| };
|
|
|
|
|