| Index: content/browser/frame_host/render_widget_host_view_guest_unittest.cc
|
| diff --git a/content/browser/frame_host/render_widget_host_view_guest_unittest.cc b/content/browser/frame_host/render_widget_host_view_guest_unittest.cc
|
| index 3a53e2284bc90e90e986faf710cb85801d9b67a6..6946b4ef8604d872f21689b6919371b0a612dd4a 100644
|
| --- a/content/browser/frame_host/render_widget_host_view_guest_unittest.cc
|
| +++ b/content/browser/frame_host/render_widget_host_view_guest_unittest.cc
|
| @@ -32,6 +32,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
|
|
|
| namespace content {
|
| @@ -59,6 +60,7 @@ class RenderWidgetHostViewGuestTest : public testing::Test {
|
| std::unique_ptr<ImageTransportFactory>(
|
| new NoTransportImageTransportFactory));
|
| #else
|
| + ContextProviderFactoryImpl::Initialize(&gpu_channel_factory_);
|
| ui::ContextProviderFactory::SetInstance(
|
| ContextProviderFactoryImpl::GetInstance());
|
| #endif
|
| @@ -87,6 +89,7 @@ class RenderWidgetHostViewGuestTest : public testing::Test {
|
| ImageTransportFactory::Terminate();
|
| #else
|
| ui::ContextProviderFactory::SetInstance(nullptr);
|
| + ContextProviderFactoryImpl::Terminate();
|
| #endif
|
| }
|
|
|
| @@ -100,6 +103,10 @@ class RenderWidgetHostViewGuestTest : public testing::Test {
|
| RenderWidgetHostImpl* widget_host_;
|
| RenderWidgetHostViewGuest* view_;
|
|
|
| +#if defined(OS_ANDROID)
|
| + MockGpuChannelEstablishFactory gpu_channel_factory_;
|
| +#endif
|
| +
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewGuestTest);
|
| };
|
| @@ -166,6 +173,10 @@ class RenderWidgetHostViewGuestSurfaceTest
|
| ImageTransportFactory::InitializeForUnitTests(
|
| std::unique_ptr<ImageTransportFactory>(
|
| new NoTransportImageTransportFactory));
|
| +#else
|
| + ContextProviderFactoryImpl::Initialize(&gpu_channel_factory_);
|
| + ui::ContextProviderFactory::SetInstance(
|
| + ContextProviderFactoryImpl::GetInstance());
|
| #endif
|
| browser_context_.reset(new TestBrowserContext);
|
| MockRenderProcessHost* process_host =
|
| @@ -195,6 +206,9 @@ class RenderWidgetHostViewGuestSurfaceTest
|
| base::RunLoop().RunUntilIdle();
|
| #if !defined(OS_ANDROID)
|
| ImageTransportFactory::Terminate();
|
| +#else
|
| + ui::ContextProviderFactory::SetInstance(nullptr);
|
| + ContextProviderFactoryImpl::Terminate();
|
| #endif
|
| }
|
|
|
| @@ -211,6 +225,10 @@ class RenderWidgetHostViewGuestSurfaceTest
|
| std::unique_ptr<TestWebContents> web_contents_;
|
| TestBrowserPluginGuest* browser_plugin_guest_;
|
|
|
| +#if defined(OS_ANDROID)
|
| + MockGpuChannelEstablishFactory gpu_channel_factory_;
|
| +#endif
|
| +
|
| // Tests should set these to NULL if they've already triggered their
|
| // destruction.
|
| RenderWidgetHostImpl* widget_host_;
|
|
|