content: Fix Context creation logic in ContextProviderFactoryImpl.

content/browser/renderer_host/context_provider_factory_impl_android.h

Index: content/browser/renderer_host/context_provider_factory_impl_android.h
diff --git a/content/browser/renderer_host/context_provider_factory_impl_android.h b/content/browser/renderer_host/context_provider_factory_impl_android.h
index 3a820fbcb3a2fc0fb6b1abc9796b9d8ee3316dcd..319b99b26b5fab3b704598ac10bea8e02334c661 100644
--- a/content/browser/renderer_host/context_provider_factory_impl_android.h
+++ b/content/browser/renderer_host/context_provider_factory_impl_android.h
@@ -41,8 +41,8 @@ class CONTENT_EXPORT ContextProviderFactoryImpl
   ~ContextProviderFactoryImpl() override;
 
   // The callback may be triggered synchronously, if the Gpu Channel is already
-  // initialized. In case the surface_handle is invalidated before the context
-  // can be created, the request is dropped and the callback will *not* run.
+  // initialized. In case the context creation fails, a null context is passed
+  // with the failure reason.
   void CreateDisplayContextProvider(
       gpu::SurfaceHandle surface_handle,
       gpu::SharedMemoryLimits shared_memory_limits,
@@ -98,11 +98,14 @@ class CONTENT_EXPORT ContextProviderFactoryImpl
   ContextProviderFactoryImpl();
 
   // Will return nullptr if the Gpu channel has not been established.
-  gpu::GpuChannelHost* EnsureGpuChannelEstablished();
+  void EstablishGpuChannel();
   void OnGpuChannelEstablished(scoped_refptr<gpu::GpuChannelHost> gpu_channel);
   void OnGpuChannelTimeout();
 
-  void HandlePendingRequests();
+  void CheckCanHandlePendingRequests();
+  void HandlePendingRequests(
+      scoped_refptr<gpu::GpuChannelHost> gpu_channel_host,
+      ContextCreationFailureReason reason);
 
   std::list<ContextProvidersRequest> context_provider_requests_;