Fix lost context recreation race in BrowserGpuChannelHostFactory

content/browser/gpu/browser_gpu_channel_host_factory.h

Index: content/browser/gpu/browser_gpu_channel_host_factory.h
diff --git a/content/browser/gpu/browser_gpu_channel_host_factory.h b/content/browser/gpu/browser_gpu_channel_host_factory.h
index df111696b3c51c4d312f05e1c79f3f36ce3fa7d6..13058e52e041d0d40162a17c3993c9b64fb4a65e 100644
--- a/content/browser/gpu/browser_gpu_channel_host_factory.h
+++ b/content/browser/gpu/browser_gpu_channel_host_factory.h
@@ -39,13 +39,17 @@ class BrowserGpuChannelHostFactory : public GpuChannelHostFactory {
     CreateRequest();
     ~CreateRequest();
     base::WaitableEvent event;
+    int gpu_host_id;
     int32 route_id;
   };
 
   struct EstablishRequest {
-    EstablishRequest();
+    explicit EstablishRequest(CauseForGpuLaunch);
     ~EstablishRequest();
     base::WaitableEvent event;
+    CauseForGpuLaunch cause_for_gpu_launch;
+    int gpu_host_id;
+    bool reused_gpu_process;
     IPC::ChannelHandle channel_handle;
     GPUInfo gpu_info;
   };
@@ -58,9 +62,8 @@ class BrowserGpuChannelHostFactory : public GpuChannelHostFactory {
       int32 surface_id,
       const GPUCreateCommandBufferConfig& init_params);
   static void CommandBufferCreatedOnIO(CreateRequest* request, int32 route_id);
-  void EstablishGpuChannelOnIO(EstablishRequest* request,
-                               CauseForGpuLaunch cause_for_gpu_launch);
-  static void GpuChannelEstablishedOnIO(
+  void EstablishGpuChannelOnIO(EstablishRequest* request);
+  void GpuChannelEstablishedOnIO(
       EstablishRequest* request,
       const IPC::ChannelHandle& channel_handle,
       const GPUInfo& gpu_info);