Reland of Merge webrtc/video_engine/ into webrtc/video/

webrtc/video_renderer.h

Index: webrtc/video_renderer.h
diff --git a/webrtc/video_renderer.h b/webrtc/video_renderer.h
index 621e7058254b4e83101bcd6a228cdc58b870ff58..7cb9ed1aa5eb54116d705a38c2ccccc46e47cdec 100644
--- a/webrtc/video_renderer.h
+++ b/webrtc/video_renderer.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_VIDEO_ENGINE_NEW_INCLUDE_VIDEO_RENDERER_H_
-#define WEBRTC_VIDEO_ENGINE_NEW_INCLUDE_VIDEO_RENDERER_H_
+#ifndef WEBRTC_VIDEO_RENDERER_H_
+#define WEBRTC_VIDEO_RENDERER_H_
 
 namespace webrtc {
 
@@ -35,4 +35,4 @@ class VideoRenderer {
 };
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_NEW_INCLUDE_VIDEO_RENDERER_H_
+#endif  // WEBRTC_VIDEO_RENDERER_H_