Fix race when setting Desktop window id.

content/browser/renderer_host/media/video_capture_manager.h

Index: content/browser/renderer_host/media/video_capture_manager.h
diff --git a/content/browser/renderer_host/media/video_capture_manager.h b/content/browser/renderer_host/media/video_capture_manager.h
index b4326678282b97ffd2d3cf755000d72d50a44b41..5bf238a078a9f866343fee2c1dd2cf8ab3c232e3 100644
--- a/content/browser/renderer_host/media/video_capture_manager.h
+++ b/content/browser/renderer_host/media/video_capture_manager.h
@@ -223,14 +223,11 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
       const std::string& id,
       media::VideoCaptureDeviceInfos& device_vector);
 
+  void MaybePostDesktopCaptureWindowId(media::VideoCaptureSessionId session_id);
   void SetDesktopCaptureWindowIdOnDeviceThread(
       media::VideoCaptureDevice* device,
       gfx::NativeViewId window_id);
 
-  void SaveDesktopCaptureWindowIdOnDeviceThread(
-      media::VideoCaptureSessionId session_id,
-      gfx::NativeViewId window_id);
-
   // The message loop of media stream device thread, where VCD's live.
   scoped_refptr<base::SingleThreadTaskRunner> device_task_runner_;
 
@@ -324,7 +321,7 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
   // active device capture format from the VideoCaptureController associated.
   media::VideoCaptureDeviceInfos devices_info_cache_;
 
-  // Accessed on the device thread only.
+  // Map used by DesktopCapture.
   std::map<media::VideoCaptureSessionId, gfx::NativeViewId>
       notification_window_ids_;