Index: content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc |
diff --git a/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc b/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc |
index ea75cfde1d2cbf15f9cbdcfad737442670f64e9c..d4791a277ce925200a3636cdd2865d4014b3ca49 100644 |
--- a/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc |
+++ b/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc |
@@ -31,11 +31,6 @@ |
#include "testing/gtest/include/gtest/gtest.h" |
#include "ui/compositor/compositor.h" |
-#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 { |
namespace { |
class MockRenderWidgetHostDelegate : public RenderWidgetHostDelegate { |
@@ -79,10 +74,6 @@ class RenderWidgetHostViewChildFrameTest : public testing::Test { |
#if !defined(OS_ANDROID) |
ImageTransportFactory::InitializeForUnitTests( |
base::WrapUnique(new NoTransportImageTransportFactory)); |
-#else |
- ContextProviderFactoryImpl::Initialize(&gpu_channel_factory_); |
- ui::ContextProviderFactory::SetInstance( |
- ContextProviderFactoryImpl::GetInstance()); |
#endif |
MockRenderProcessHost* process_host = |
@@ -109,9 +100,6 @@ class RenderWidgetHostViewChildFrameTest : public testing::Test { |
base::RunLoop().RunUntilIdle(); |
#if !defined(OS_ANDROID) |
ImageTransportFactory::Terminate(); |
-#else |
- ui::ContextProviderFactory::SetInstance(nullptr); |
- ContextProviderFactoryImpl::Terminate(); |
#endif |
} |
@@ -130,10 +118,6 @@ class RenderWidgetHostViewChildFrameTest : public testing::Test { |
RenderWidgetHostViewChildFrame* view_; |
MockCrossProcessFrameConnector* test_frame_connector_; |
-#if defined(OS_ANDROID) |
- MockGpuChannelEstablishFactory gpu_channel_factory_; |
-#endif |
- |
private: |
DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrameTest); |
}; |