diff --git a/modules/video_capture/BUILD.gn b/modules/video_capture/BUILD.gn
index 7f1fad2ad1..96d5173e01 100644
--- a/modules/video_capture/BUILD.gn
+++ b/modules/video_capture/BUILD.gn
@@ -81,7 +81,6 @@ if (!build_with_chromium) {
   config("video_capture_internal_impl_warnings_config") {
     if (is_win && is_clang) {
       cflags = [
-        "-Wno-comment",
         "-Wno-ignored-attributes",
 
         # See https://bugs.chromium.org/p/webrtc/issues/detail?id=6269
diff --git a/modules/video_capture/windows/device_info_ds.cc b/modules/video_capture/windows/device_info_ds.cc
index 9ca0cce11c..5e158fe478 100644
--- a/modules/video_capture/windows/device_info_ds.cc
+++ b/modules/video_capture/windows/device_info_ds.cc
@@ -539,13 +539,12 @@ int32_t DeviceInfoDS::CreateCapabilityMap(const char* deviceUniqueIdUTF8)
   return static_cast<int32_t>(_captureCapabilities.size());
 }
 
-/* Constructs a product ID from the Windows DevicePath. on a USB device the
- devicePath contains product id and vendor id. This seems to work for firewire
- as well
- /* Example of device path
- "\\?\usb#vid_0408&pid_2010&mi_00#7&258e7aaf&0&0000#{65e8773d-8f56-11d0-a3b9-00a0c9223196}\global"
- "\\?\avc#sony&dv-vcr&camcorder&dv#65b2d50301460008#{65e8773d-8f56-11d0-a3b9-00a0c9223196}\global"
- */
+// Constructs a product ID from the Windows DevicePath. on a USB device the
+// devicePath contains product id and vendor id. This seems to work for firewire
+// as well.
+// Example of device path:
+// "\\?\usb#vid_0408&pid_2010&mi_00#7&258e7aaf&0&0000#{65e8773d-8f56-11d0-a3b9-00a0c9223196}\global"
+// "\\?\avc#sony&dv-vcr&camcorder&dv#65b2d50301460008#{65e8773d-8f56-11d0-a3b9-00a0c9223196}\global"
 void DeviceInfoDS::GetProductId(const char* devicePath,
                                 char* productUniqueIdUTF8,
                                 uint32_t productUniqueIdUTF8Length) {
diff --git a/test/BUILD.gn b/test/BUILD.gn
index c69ad08eb8..54e209726d 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -604,7 +604,6 @@ config("test_renderer_exported_config") {
     # come from a config and cannot be on the target directly.
     cflags = [
       "-Wno-bool-conversion",
-      "-Wno-comment",
       "-Wno-delete-non-virtual-dtor",
     ]
   }