content/ui[Android]: Remove ContextProviderFactory.

content/test/test_render_view_host.cc

Index: content/test/test_render_view_host.cc
diff --git a/content/test/test_render_view_host.cc b/content/test/test_render_view_host.cc
index 9464fc51e6ab9bf8c8e30453391ae6d08aaceba1..2b143486c90a7890fd01f4b31bac4c525e6e842e 100644
--- a/content/test/test_render_view_host.cc
+++ b/content/test/test_render_view_host.cc
@@ -32,10 +32,6 @@
 #include "ui/compositor/compositor.h"
 #include "ui/gfx/geometry/rect.h"
 
-#if defined(OS_ANDROID)
-#include "content/browser/renderer_host/context_provider_factory_impl_android.h"
-#endif
-
 namespace content {
 
 void InitNavigateParams(FrameHostMsg_DidCommitProvisionalLoad_Params* params,
@@ -64,11 +60,8 @@ TestRenderWidgetHostView::TestRenderWidgetHostView(RenderWidgetHost* rwh)
       is_occluded_(false),
       did_swap_compositor_frame_(false) {
 #if defined(OS_ANDROID)
-  // Not all tests initialize or need a context provider factory.
-  if (ContextProviderFactoryImpl::GetInstance()) {
-    frame_sink_id_ = AllocateFrameSinkId();
-    GetSurfaceManager()->RegisterFrameSinkId(frame_sink_id_);
-  }
+  frame_sink_id_ = AllocateFrameSinkId();
+  GetSurfaceManager()->RegisterFrameSinkId(frame_sink_id_);
 #else
   // Not all tests initialize or need an image transport factory.
   if (ImageTransportFactory::GetInstance()) {
@@ -81,13 +74,7 @@ TestRenderWidgetHostView::TestRenderWidgetHostView(RenderWidgetHost* rwh)
 }
 
 TestRenderWidgetHostView::~TestRenderWidgetHostView() {
-  cc::SurfaceManager* manager = nullptr;
-#if defined(OS_ANDROID)
-  if (ContextProviderFactoryImpl::GetInstance())
-    manager = GetSurfaceManager();
-#else
-  manager = GetSurfaceManager();
-#endif
+  cc::SurfaceManager* manager = GetSurfaceManager();
   if (manager) {
     manager->InvalidateFrameSinkId(frame_sink_id_);
   }