content: Add ContextProviderFactory to create a render ContextProvider.

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 e77dd9126a2a37e1d308a920ca18a33d785daa83..1b53f8bef0db407b9310a85fcc505113554db1af 100644
--- a/content/browser/renderer_host/compositor_impl_android.h
+++ b/content/browser/renderer_host/compositor_impl_android.h
@@ -23,6 +23,7 @@
 #include "gpu/command_buffer/common/capabilities.h"
 #include "gpu/ipc/common/surface_handle.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"
@@ -36,6 +37,7 @@ class Layer;
 class LayerTreeHost;
 class SurfaceIdAllocator;
 class SurfaceManager;
+class VulkanContextProvider;
 class VulkanInProcessContextProvider;
 }
 
@@ -63,12 +65,6 @@ class CONTENT_EXPORT CompositorImpl
 
   static bool IsInitialized();
 
-  static cc::SurfaceManager* GetSurfaceManager();
-  static uint32_t AllocateSurfaceClientId();
-
-  static scoped_refptr<cc::VulkanInProcessContextProvider>
-  SharedVulkanContextProviderAndroid();
-
   void PopulateGpuCapabilities(gpu::Capabilities gpu_capabilities);
 
   void AddObserver(VSyncObserver* observer);
@@ -122,11 +118,19 @@ class CONTENT_EXPORT CompositorImpl
                base::TimeDelta vsync_period) override;
   void SetNeedsAnimate() override;
   void SetVisible(bool visible);
-  void CreateOutputSurface();
   void CreateLayerTreeHost();
 
-  void OnGpuChannelEstablished();
-  void OnGpuChannelTimeout();
+  void HandlePendingOutputSurfaceRequest();
+
+#if defined(ENABLE_VULKAN)
+  void CreateVulkanOutputSurface();
+#endif
+  void CreateCompositorOutputSurface(
+      const scoped_refptr<cc::ContextProvider>& context_provider);
+  void InitializeDisplay(
+      std::unique_ptr<cc::OutputSurface> display_output_surface,
+      scoped_refptr<cc::VulkanContextProvider> vulkan_context_provider,
+      scoped_refptr<cc::ContextProvider> context_provider);
 
   // root_layer_ is the persistent internal root layer, while subroot_layer_
   // is the one attached by the compositor client.
@@ -160,8 +164,6 @@ class CONTENT_EXPORT CompositorImpl
 
   size_t num_successive_context_creation_failures_;
 
-  base::OneShotTimer establish_gpu_channel_timeout_;
-
   // Whether there is an OutputSurface request pending from the current
   // |host_|. Becomes |true| if RequestNewOutputSurface is called, and |false|
   // if |host_| is deleted or we succeed in creating *and* initializing an