content/ui[Android]: Remove ContextProviderFactory.

content/browser/renderer_host/offscreen_canvas_surface_manager_unittest.cc

Index: content/browser/renderer_host/offscreen_canvas_surface_manager_unittest.cc
diff --git a/content/browser/renderer_host/offscreen_canvas_surface_manager_unittest.cc b/content/browser/renderer_host/offscreen_canvas_surface_manager_unittest.cc
index a00a043cbc9042b415dfdd74b2a6f26efb37db54..28999b311b8d90491eb651aed6d87df03057579a 100644
--- a/content/browser/renderer_host/offscreen_canvas_surface_manager_unittest.cc
+++ b/content/browser/renderer_host/offscreen_canvas_surface_manager_unittest.cc
@@ -12,8 +12,6 @@
 
 #if defined(OS_ANDROID)
 #include "base/memory/ptr_util.h"
-#include "content/browser/renderer_host/context_provider_factory_impl_android.h"
-#include "content/test/mock_gpu_channel_establish_factory.h"
 #else
 #include "content/browser/compositor/image_transport_factory.h"
 #endif
@@ -39,17 +37,10 @@ class OffscreenCanvasSurfaceManagerTest : public testing::Test {
  private:
   std::unique_ptr<TestBrowserThread> ui_thread_;
   base::MessageLoopForUI message_loop_;
-#if defined(OS_ANDROID)
-  MockGpuChannelEstablishFactory gpu_channel_factory_;
-#endif
 };
 
 void OffscreenCanvasSurfaceManagerTest::SetUp() {
-#if defined(OS_ANDROID)
-  ContextProviderFactoryImpl::Initialize(&gpu_channel_factory_);
-  ui::ContextProviderFactory::SetInstance(
-      ContextProviderFactoryImpl::GetInstance());
-#else
+#if !defined(OS_ANDROID)
   ImageTransportFactory::InitializeForUnitTests(
       std::unique_ptr<ImageTransportFactory>(
           new NoTransportImageTransportFactory));
@@ -58,10 +49,7 @@ void OffscreenCanvasSurfaceManagerTest::SetUp() {
 }
 
 void OffscreenCanvasSurfaceManagerTest::TearDown() {
-#if defined(OS_ANDROID)
-  ui::ContextProviderFactory::SetInstance(nullptr);
-  ContextProviderFactoryImpl::Terminate();
-#else
+#if !defined(OS_ANDROID)
   ImageTransportFactory::Terminate();
 #endif
 }