Removed nolint for include guards.
BUG=
TEST=cpplint.py --filter=-build/header_guard src/video_engine
Review URL: https://webrtc-codereview.appspot.com/676008
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2469 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/src/video_engine/vie_base_impl.h b/src/video_engine/vie_base_impl.h
index 796971b..3d914ec 100644
--- a/src/video_engine/vie_base_impl.h
+++ b/src/video_engine/vie_base_impl.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_BASE_IMPL_H_ // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_BASE_IMPL_H_ // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_BASE_IMPL_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_BASE_IMPL_H_
#include "video_engine/include/vie_base.h"
#include "video_engine/vie_defines.h"
@@ -69,4 +69,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_ENGINE_VIE_BASE_IMPL_H_ // NOLINT
+#endif // WEBRTC_VIDEO_ENGINE_VIE_BASE_IMPL_H_
diff --git a/src/video_engine/vie_capture_impl.h b/src/video_engine/vie_capture_impl.h
index 99880be..fd6589d 100644
--- a/src/video_engine/vie_capture_impl.h
+++ b/src/video_engine/vie_capture_impl.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_CAPTURE_IMPL_H_ // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_CAPTURE_IMPL_H_ // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_CAPTURE_IMPL_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_CAPTURE_IMPL_H_
#include "typedefs.h" // NOLINT
#include "video_engine/include/vie_capture.h"
@@ -78,4 +78,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_ENGINE_VIE_CAPTURE_IMPL_H_ // NOLINT
+#endif // WEBRTC_VIDEO_ENGINE_VIE_CAPTURE_IMPL_H_
diff --git a/src/video_engine/vie_capturer.h b/src/video_engine/vie_capturer.h
index 1a50e82..bec36f9 100644
--- a/src/video_engine/vie_capturer.h
+++ b/src/video_engine/vie_capturer.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_CAPTURER_H_ // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_CAPTURER_H_ // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_CAPTURER_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_CAPTURER_H_
#include "common_types.h" // NOLINT
#include "engine_configurations.h" // NOLINT
@@ -221,4 +221,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_ENGINE_VIE_CAPTURER_H_ // NOLINT
+#endif // WEBRTC_VIDEO_ENGINE_VIE_CAPTURER_H_
diff --git a/src/video_engine/vie_channel.h b/src/video_engine/vie_channel.h
index 381b8c4..eadfc3b 100644
--- a/src/video_engine/vie_channel.h
+++ b/src/video_engine/vie_channel.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_ // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_ // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_
#include <list>
@@ -397,4 +397,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_ // NOLINT
+#endif // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_
diff --git a/src/video_engine/vie_codec_impl.h b/src/video_engine/vie_codec_impl.h
index f017706..2d34540 100644
--- a/src/video_engine/vie_codec_impl.h
+++ b/src/video_engine/vie_codec_impl.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_CODEC_IMPL_H_ // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_CODEC_IMPL_H_ // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_CODEC_IMPL_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_CODEC_IMPL_H_
#include "typedefs.h" // NOLINT
#include "video_engine/include/vie_codec.h"
@@ -78,4 +78,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_ENGINE_VIE_CODEC_IMPL_H_ // NOLINT
+#endif // WEBRTC_VIDEO_ENGINE_VIE_CODEC_IMPL_H_
diff --git a/src/video_engine/vie_defines.h b/src/video_engine/vie_defines.h
index bc0931e..2cc18cc 100644
--- a/src/video_engine/vie_defines.h
+++ b/src/video_engine/vie_defines.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_ENGINE_MAIN_SOURCE_VIE_DEFINES_H_ // NOLINT
-#define WEBRTC_VIDEO_ENGINE_MAIN_SOURCE_VIE_DEFINES_H_ // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_MAIN_SOURCE_VIE_DEFINES_H_
+#define WEBRTC_VIDEO_ENGINE_MAIN_SOURCE_VIE_DEFINES_H_
#include "engine_configurations.h" // NOLINT
@@ -218,4 +218,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_ENGINE_MAIN_SOURCE_VIE_DEFINES_H_ // NOLINT
+#endif // WEBRTC_VIDEO_ENGINE_MAIN_SOURCE_VIE_DEFINES_H_
diff --git a/src/video_engine/vie_encoder.h b/src/video_engine/vie_encoder.h
index 068bce3..52410bf 100644
--- a/src/video_engine/vie_encoder.h
+++ b/src/video_engine/vie_encoder.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_ // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_ // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_
#include "common_types.h" // NOLINT
#include "typedefs.h" //NOLINT
@@ -187,4 +187,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_ // NOLINT
+#endif // WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_
diff --git a/src/video_engine/vie_encryption_impl.h b/src/video_engine/vie_encryption_impl.h
index 63866f3..608a5ab 100644
--- a/src/video_engine/vie_encryption_impl.h
+++ b/src/video_engine/vie_encryption_impl.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_ENCRYPTION_IMPL_H_ // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_ENCRYPTION_IMPL_H_ // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_ENCRYPTION_IMPL_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_ENCRYPTION_IMPL_H_
#include "typedefs.h" // NOLINT
#include "video_engine/include/vie_encryption.h"
@@ -40,4 +40,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_ENGINE_VIE_ENCRYPTION_IMPL_H_ // NOLINT
+#endif // WEBRTC_VIDEO_ENGINE_VIE_ENCRYPTION_IMPL_H_
diff --git a/src/video_engine/vie_external_codec_impl.h b/src/video_engine/vie_external_codec_impl.h
index 4928ed5..f06613f 100644
--- a/src/video_engine/vie_external_codec_impl.h
+++ b/src/video_engine/vie_external_codec_impl.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_EXTERNAL_CODEC_IMPL_H_ // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_EXTERNAL_CODEC_IMPL_H_ // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_EXTERNAL_CODEC_IMPL_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_EXTERNAL_CODEC_IMPL_H_
#include "video_engine/include/vie_external_codec.h"
#include "video_engine/vie_ref_count.h"
@@ -47,4 +47,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_ENGINE_VIE_EXTERNAL_CODEC_IMPL_H_ // NOLINT
+#endif // WEBRTC_VIDEO_ENGINE_VIE_EXTERNAL_CODEC_IMPL_H_
diff --git a/src/video_engine/vie_file_image.h b/src/video_engine/vie_file_image.h
index f06a120..e3f229a 100644
--- a/src/video_engine/vie_file_image.h
+++ b/src/video_engine/vie_file_image.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_FILE_IMAGE_H_ // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_FILE_IMAGE_H_ // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_FILE_IMAGE_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_FILE_IMAGE_H_
#include "modules/interface/module_common_types.h"
#include "typedefs.h" // NOLINT
@@ -29,4 +29,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_ENGINE_VIE_FILE_IMAGE_H_ // NOLINT
+#endif // WEBRTC_VIDEO_ENGINE_VIE_FILE_IMAGE_H_
diff --git a/src/video_engine/vie_file_impl.h b/src/video_engine/vie_file_impl.h
index 2e735fb..29f5329 100644
--- a/src/video_engine/vie_file_impl.h
+++ b/src/video_engine/vie_file_impl.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_FILE_IMPL_H_ // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_FILE_IMPL_H_ // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_FILE_IMPL_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_FILE_IMPL_H_
#include "system_wrappers/interface/scoped_ptr.h"
#include "typedefs.h" // NOLINT
@@ -134,4 +134,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_ENGINE_VIE_FILE_IMPL_H_ // NOLINT
+#endif // WEBRTC_VIDEO_ENGINE_VIE_FILE_IMPL_H_
diff --git a/src/video_engine/vie_file_player.h b/src/video_engine/vie_file_player.h
index d3608ac..15ac35a 100644
--- a/src/video_engine/vie_file_player.h
+++ b/src/video_engine/vie_file_player.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_FILE_PLAYER_H_ // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_FILE_PLAYER_H_ // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_FILE_PLAYER_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_FILE_PLAYER_H_
#include <list>
#include <set>
@@ -135,4 +135,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_ENGINE_VIE_FILE_PLAYER_H_ // NOLINT
+#endif // WEBRTC_VIDEO_ENGINE_VIE_FILE_PLAYER_H_
diff --git a/src/video_engine/vie_file_recorder.h b/src/video_engine/vie_file_recorder.h
index c3738f3..ba25ce3 100644
--- a/src/video_engine/vie_file_recorder.h
+++ b/src/video_engine/vie_file_recorder.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_FILE_RECORDER_H_ // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_FILE_RECORDER_H_ // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_FILE_RECORDER_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_FILE_RECORDER_H_
#include "modules/utility/interface/file_recorder.h"
#include "typedefs.h" // NOLINT
@@ -62,4 +62,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_ENGINE_VIE_FILE_RECORDER_H_ // NOLINT
+#endif // WEBRTC_VIDEO_ENGINE_VIE_FILE_RECORDER_H_
diff --git a/src/video_engine/vie_frame_provider_base.h b/src/video_engine/vie_frame_provider_base.h
index c00c474..2f75adb 100644
--- a/src/video_engine/vie_frame_provider_base.h
+++ b/src/video_engine/vie_frame_provider_base.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_FRAME_PROVIDER_BASE_H_ // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_FRAME_PROVIDER_BASE_H_ // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_FRAME_PROVIDER_BASE_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_FRAME_PROVIDER_BASE_H_
#include <vector>
@@ -99,4 +99,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_ENGINE_VIE_FRAME_PROVIDER_BASE_H_ // NOLINT
+#endif // WEBRTC_VIDEO_ENGINE_VIE_FRAME_PROVIDER_BASE_H_
diff --git a/src/video_engine/vie_image_process_impl.h b/src/video_engine/vie_image_process_impl.h
index 09c0a8e..4a8c5f9 100644
--- a/src/video_engine/vie_image_process_impl.h
+++ b/src/video_engine/vie_image_process_impl.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_IMAGE_PROCESS_IMPL_H_ // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_IMAGE_PROCESS_IMPL_H_ // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_IMAGE_PROCESS_IMPL_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_IMAGE_PROCESS_IMPL_H_
#include "typedefs.h" // NOLINT
#include "video_engine/include/vie_image_process.h"
@@ -49,4 +49,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_ENGINE_VIE_IMAGE_PROCESS_IMPL_H_ // NOLINT
+#endif // WEBRTC_VIDEO_ENGINE_VIE_IMAGE_PROCESS_IMPL_H_
diff --git a/src/video_engine/vie_impl.h b/src/video_engine/vie_impl.h
index 2304490..ca5d903 100644
--- a/src/video_engine/vie_impl.h
+++ b/src/video_engine/vie_impl.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_IMPL_H_ // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_IMPL_H_ // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_IMPL_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_IMPL_H_
#include "engine_configurations.h" // NOLINT
#include "video_engine/vie_defines.h"
@@ -112,4 +112,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_ENGINE_VIE_IMPL_H_ // NOLINT
+#endif // WEBRTC_VIDEO_ENGINE_VIE_IMPL_H_
diff --git a/src/video_engine/vie_input_manager.h b/src/video_engine/vie_input_manager.h
index d71dae2..465472d 100644
--- a/src/video_engine/vie_input_manager.h
+++ b/src/video_engine/vie_input_manager.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_INPUT_MANAGER_H_ // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_INPUT_MANAGER_H_ // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_INPUT_MANAGER_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_INPUT_MANAGER_H_
#include "modules/video_capture/main/interface/video_capture.h"
#include "system_wrappers/interface/map_wrapper.h"
@@ -137,4 +137,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_ENGINE_VIE_INPUT_MANAGER_H_ // NOLINT
+#endif // WEBRTC_VIDEO_ENGINE_VIE_INPUT_MANAGER_H_
diff --git a/src/video_engine/vie_manager_base.h b/src/video_engine/vie_manager_base.h
index 18606e3..088a2b8 100644
--- a/src/video_engine/vie_manager_base.h
+++ b/src/video_engine/vie_manager_base.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_MANAGER_BASE_H_ // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_MANAGER_BASE_H_ // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_MANAGER_BASE_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_MANAGER_BASE_H_
namespace webrtc {
@@ -72,4 +72,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_ENGINE_VIE_MANAGER_BASE_H_ // NOLINT
+#endif // WEBRTC_VIDEO_ENGINE_VIE_MANAGER_BASE_H_
diff --git a/src/video_engine/vie_network_impl.h b/src/video_engine/vie_network_impl.h
index cc46923..56832df 100644
--- a/src/video_engine/vie_network_impl.h
+++ b/src/video_engine/vie_network_impl.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_NETWORK_IMPL_H_ // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_NETWORK_IMPL_H_ // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_NETWORK_IMPL_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_NETWORK_IMPL_H_
#include "typedefs.h" // NOLINT
#include "video_engine/include/vie_network.h"
@@ -111,4 +111,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_ENGINE_VIE_NETWORK_IMPL_H_ // NOLINT
+#endif // WEBRTC_VIDEO_ENGINE_VIE_NETWORK_IMPL_H_
diff --git a/src/video_engine/vie_performance_monitor.h b/src/video_engine/vie_performance_monitor.h
index e4f65d6..1dc72ec 100644
--- a/src/video_engine/vie_performance_monitor.h
+++ b/src/video_engine/vie_performance_monitor.h
@@ -11,8 +11,8 @@
// ViEPerformanceMonitor is used to check the current CPU usage and triggers a
// callback when getting over a specified threshold.
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_PERFORMANCE_MONITOR_H_ // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_PERFORMANCE_MONITOR_H_ // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_PERFORMANCE_MONITOR_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_PERFORMANCE_MONITOR_H_
#include "system_wrappers/interface/scoped_ptr.h"
#include "typedefs.h" // NOLINT
@@ -51,4 +51,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_ENGINE_VIE_PERFORMANCE_MONITOR_H_ // NOLINT
+#endif // WEBRTC_VIDEO_ENGINE_VIE_PERFORMANCE_MONITOR_H_
diff --git a/src/video_engine/vie_receiver.h b/src/video_engine/vie_receiver.h
index 1537d98..09fbc8f 100644
--- a/src/video_engine/vie_receiver.h
+++ b/src/video_engine/vie_receiver.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_RECEIVER_H_ // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_RECEIVER_H_ // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_RECEIVER_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_RECEIVER_H_
#include <list>
@@ -84,4 +84,4 @@
} // namespace webrt
-#endif // WEBRTC_VIDEO_ENGINE_VIE_RECEIVER_H_ // NOLINT
+#endif // WEBRTC_VIDEO_ENGINE_VIE_RECEIVER_H_
diff --git a/src/video_engine/vie_ref_count.h b/src/video_engine/vie_ref_count.h
index 15241d4..5ac9a3e 100644
--- a/src/video_engine/vie_ref_count.h
+++ b/src/video_engine/vie_ref_count.h
@@ -10,8 +10,8 @@
// TODO(mflodman) Remove this class and use ref count class in system_wrappers.
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_REF_COUNT_H_ // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_REF_COUNT_H_ // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_REF_COUNT_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_REF_COUNT_H_
#include "system_wrappers/interface/scoped_ptr.h"
@@ -37,4 +37,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_ENGINE_VIE_REF_COUNT_H_ // NOLINT
+#endif // WEBRTC_VIDEO_ENGINE_VIE_REF_COUNT_H_
diff --git a/src/video_engine/vie_remb.h b/src/video_engine/vie_remb.h
index de7c28f..3f530a6 100644
--- a/src/video_engine/vie_remb.h
+++ b/src/video_engine/vie_remb.h
@@ -15,8 +15,8 @@
// for a specified SSRC.
-#ifndef WEBRTC_VIDEO_ENGINE_MAIN_SOURCE_VIE_REMB_H_ // NOLINT
-#define WEBRTC_VIDEO_ENGINE_MAIN_SOURCE_VIE_REMB_H_ // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_MAIN_SOURCE_VIE_REMB_H_
+#define WEBRTC_VIDEO_ENGINE_MAIN_SOURCE_VIE_REMB_H_
#include <list>
#include <map>
@@ -89,4 +89,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_ENGINE_MAIN_SOURCE_VIE_REMB_H_ // NOLINT
+#endif // WEBRTC_VIDEO_ENGINE_MAIN_SOURCE_VIE_REMB_H_
diff --git a/src/video_engine/vie_render_impl.h b/src/video_engine/vie_render_impl.h
index ec7cace..c0cf916 100644
--- a/src/video_engine/vie_render_impl.h
+++ b/src/video_engine/vie_render_impl.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_RENDER_IMPL_H_ // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_RENDER_IMPL_H_ // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_RENDER_IMPL_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_RENDER_IMPL_H_
#include "modules/video_render/main/interface/video_render_defines.h"
#include "typedefs.h" // NOLINT
@@ -55,4 +55,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_ENGINE_VIE_RENDER_IMPL_H_ // NOLINT
+#endif // WEBRTC_VIDEO_ENGINE_VIE_RENDER_IMPL_H_
diff --git a/src/video_engine/vie_render_manager.h b/src/video_engine/vie_render_manager.h
index d090fbf..ebdf862 100644
--- a/src/video_engine/vie_render_manager.h
+++ b/src/video_engine/vie_render_manager.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_RENDER_MANAGER_H_ // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_RENDER_MANAGER_H_ // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_RENDER_MANAGER_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_RENDER_MANAGER_H_
#include "system_wrappers/interface/list_wrapper.h"
#include "system_wrappers/interface/map_wrapper.h"
@@ -70,4 +70,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_ENGINE_VIE_RENDER_MANAGER_H_ // NOLINT
+#endif // WEBRTC_VIDEO_ENGINE_VIE_RENDER_MANAGER_H_
diff --git a/src/video_engine/vie_renderer.h b/src/video_engine/vie_renderer.h
index fc061cf..dd216ea 100644
--- a/src/video_engine/vie_renderer.h
+++ b/src/video_engine/vie_renderer.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_RENDERER_H_ // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_RENDERER_H_ // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_RENDERER_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_RENDERER_H_
#include "modules/video_render/main/interface/video_render_defines.h"
#include "system_wrappers/interface/map_wrapper.h"
@@ -113,4 +113,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_ENGINE_VIE_RENDERER_H_ // NOLINT
+#endif // WEBRTC_VIDEO_ENGINE_VIE_RENDERER_H_
diff --git a/src/video_engine/vie_rtp_rtcp_impl.h b/src/video_engine/vie_rtp_rtcp_impl.h
index 43844fb..89d4c8d 100644
--- a/src/video_engine/vie_rtp_rtcp_impl.h
+++ b/src/video_engine/vie_rtp_rtcp_impl.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_RTP_RTCP_IMPL_H_ // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_RTP_RTCP_IMPL_H_ // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_RTP_RTCP_IMPL_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_RTP_RTCP_IMPL_H_
#include "modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
#include "typedefs.h" // NOLINT
@@ -116,4 +116,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_ENGINE_VIE_RTP_RTCP_IMPL_H_ // NOLINT
+#endif // WEBRTC_VIDEO_ENGINE_VIE_RTP_RTCP_IMPL_H_
diff --git a/src/video_engine/vie_sender.h b/src/video_engine/vie_sender.h
index db41bba..c9a1ef8 100644
--- a/src/video_engine/vie_sender.h
+++ b/src/video_engine/vie_sender.h
@@ -11,8 +11,8 @@
// ViESender is responsible for encrypting, if enabled, packets and send to
// network.
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_SENDER_H_ // NOLINT
-#define WEBRTC_VIDEO_ENGINE_VIE_SENDER_H_ // NOLINT
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_SENDER_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_SENDER_H_
#include "common_types.h" // NOLINT
#include "engine_configurations.h" // NOLINT
@@ -61,4 +61,4 @@
} // namespace webrtc
-#endif // WEBRTC_VIDEO_ENGINE_VIE_SENDER_H_ // NOLINT
+#endif // WEBRTC_VIDEO_ENGINE_VIE_SENDER_H_
