| Index: content/public/test/test_renderer_host.cc
|
| diff --git a/content/public/test/test_renderer_host.cc b/content/public/test/test_renderer_host.cc
|
| index 388a9d9b45a43e6f4fd4cbe4408a7fa22ab07843..a53eee5d742b7e2c28aa93fd22241e7b51571415 100644
|
| --- a/content/public/test/test_renderer_host.cc
|
| +++ b/content/public/test/test_renderer_host.cc
|
| @@ -30,6 +30,7 @@
|
|
|
| #if defined(OS_ANDROID)
|
| #include "content/browser/renderer_host/context_provider_factory_impl_android.h"
|
| +#include "content/test/mock_gpu_channel_establish_factory.h"
|
| #endif
|
|
|
| #if defined(OS_WIN)
|
| @@ -245,6 +246,8 @@ void RenderViewHostTestHarness::SetUp() {
|
| ImageTransportFactory::InitializeForUnitTests(
|
| base::WrapUnique(new NoTransportImageTransportFactory));
|
| #else
|
| + gpu_channel_factory_ = base::MakeUnique<MockGpuChannelEstablishFactory>();
|
| + ContextProviderFactoryImpl::Initialize(gpu_channel_factory_.get());
|
| ui::ContextProviderFactory::SetInstance(
|
| ContextProviderFactoryImpl::GetInstance());
|
| #endif
|
| @@ -314,6 +317,8 @@ void RenderViewHostTestHarness::TearDown() {
|
| ImageTransportFactory::Terminate();
|
| #else
|
| ui::ContextProviderFactory::SetInstance(nullptr);
|
| + ContextProviderFactoryImpl::Terminate();
|
| + gpu_channel_factory_.reset();
|
| #endif
|
| }
|
|
|
|
|