content/ui[Android]: Remove ContextProviderFactory.

content/browser/renderer_host/compositor_impl_android.h

Index: content/browser/renderer_host/compositor_impl_android.h
diff --git a/content/browser/renderer_host/compositor_impl_android.h b/content/browser/renderer_host/compositor_impl_android.h
index 57d791fb84fe294ac1a1a87e04f9bfbad7dc7903..3d3aae81f8164f82810321161f735a649e784894 100644
--- a/content/browser/renderer_host/compositor_impl_android.h
+++ b/content/browser/renderer_host/compositor_impl_android.h
@@ -24,7 +24,6 @@
 #include "gpu/ipc/common/surface_handle.h"
 #include "services/ui/public/cpp/gpu/context_provider_command_buffer.h"
 #include "third_party/khronos/GLES2/gl2.h"
-#include "ui/android/context_provider_factory.h"
 #include "ui/android/resources/resource_manager_impl.h"
 #include "ui/android/resources/ui_resource_provider.h"
 #include "ui/android/window_android_compositor.h"
@@ -34,9 +33,11 @@ struct ANativeWindow;
 namespace cc {
 class AnimationHost;
 class Display;
+class FrameSinkId;
 class Layer;
 class LayerTreeHost;
 class OutputSurface;
+class SurfaceManager;
 class VulkanContextProvider;
 }
 
@@ -58,6 +59,9 @@ class CONTENT_EXPORT CompositorImpl
 
   static bool IsInitialized();
 
+  static cc::SurfaceManager* GetSurfaceManager();
+  static cc::FrameSinkId AllocateFrameSinkId();
+
   // ui::ResourceProvider implementation.
   cc::UIResourceId CreateUIResource(cc::UIResourceClient* client) override;
   void DeleteUIResource(cc::UIResourceId resource_id) override;
@@ -115,8 +119,8 @@ class CONTENT_EXPORT CompositorImpl
   void CreateVulkanOutputSurface();
 #endif
   void OnGpuChannelEstablished(
-      scoped_refptr<gpu::GpuChannelHost> gpu_channel_host,
-      ui::ContextProviderFactory::GpuChannelHostResult result);
+      scoped_refptr<gpu::GpuChannelHost> gpu_channel_host);
+  void OnGpuChannelTimeout();
   void InitializeDisplay(
       std::unique_ptr<cc::OutputSurface> display_output_surface,
       scoped_refptr<cc::VulkanContextProvider> vulkan_context_provider,
@@ -160,6 +164,8 @@ class CONTENT_EXPORT CompositorImpl
 
   size_t num_successive_context_creation_failures_;
 
+  base::OneShotTimer establish_gpu_channel_timeout_;
+
   // Whether there is an CompositorFrameSink request pending from the current
   // |host_|. Becomes |true| if RequestNewCompositorFrameSink is called, and
   // |false| if |host_| is deleted or we succeed in creating *and* initializing