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..24f169304069cac320726dd29b2c5e54be3edfd5 100644
--- a/content/browser/renderer_host/compositor_impl_android.h
+++ b/content/browser/renderer_host/compositor_impl_android.h
@@ -63,12 +63,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 +116,11 @@ class CONTENT_EXPORT CompositorImpl
                base::TimeDelta vsync_period) override;
   void SetNeedsAnimate() override;
   void SetVisible(bool visible);
-  void CreateOutputSurface();
+  void CreateOutputSurface(scoped_refptr<gpu::GpuChannelHost> gpu_channel_host);
   void CreateLayerTreeHost();
 
-  void OnGpuChannelEstablished();
-  void OnGpuChannelTimeout();
+  void OnGpuChannelEstablished(
+      scoped_refptr<gpu::GpuChannelHost> gpu_channel_host);
 
   // root_layer_ is the persistent internal root layer, while subroot_layer_
   // is the one attached by the compositor client.
@@ -160,8 +154,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