Revert of Revert "Revert of content: Fix Context creation logic in ContextProviderFactoryImpl."

content/browser/renderer_host/render_widget_host_unittest.cc

Index: content/browser/renderer_host/render_widget_host_unittest.cc
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc
index d1c7d8e727939d5394ef57ba3f5c63363da2f6b3..52f6befc39868e6e73c5adb41b3ec0fee8bc6480 100644
--- a/content/browser/renderer_host/render_widget_host_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -39,7 +39,6 @@
 #if defined(OS_ANDROID)
 #include "content/browser/renderer_host/context_provider_factory_impl_android.h"
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
-#include "content/test/mock_gpu_channel_establish_factory.h"
 #endif
 
 #if defined(USE_AURA) || defined(OS_MACOSX)
@@ -473,7 +472,6 @@
             new NoTransportImageTransportFactory));
 #endif
 #if defined(OS_ANDROID)
-    ContextProviderFactoryImpl::Initialize(&gpu_channel_factory_);
     ui::ContextProviderFactory::SetInstance(
         ContextProviderFactoryImpl::GetInstance());
 #endif
@@ -507,7 +505,6 @@
 #endif
 #if defined(OS_ANDROID)
     ui::ContextProviderFactory::SetInstance(nullptr);
-    ContextProviderFactoryImpl::Terminate();
 #endif
 
     // Process all pending tasks to avoid leaks.
@@ -653,10 +650,6 @@
   bool handle_mouse_event_;
   double last_simulated_event_time_seconds_;
   double simulated_event_time_delta_seconds_;
-
-#if defined(OS_ANDROID)
-  MockGpuChannelEstablishFactory gpu_channel_factory_;
-#endif
 
  private:
   SyntheticWebTouchEvent touch_event_;