Merge webrtc/video_engine/ into webrtc/video/

webrtc/test/video_capturer.h

Index: webrtc/test/video_capturer.h
diff --git a/webrtc/test/video_capturer.h b/webrtc/test/video_capturer.h
index 3fe86f19985851b3165f4a8654e40507d002a41b..169fd7151d656fe432c67fd5f978906b146628b0 100644
--- a/webrtc/test/video_capturer.h
+++ b/webrtc/test/video_capturer.h
@@ -7,8 +7,8 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#ifndef WEBRTC_VIDEO_ENGINE_TEST_COMMON_VIDEO_CAPTURER_H_
-#define WEBRTC_VIDEO_ENGINE_TEST_COMMON_VIDEO_CAPTURER_H_
+#ifndef WEBRTC_TEST_VIDEO_CAPTURER_H_
+#define WEBRTC_TEST_VIDEO_CAPTURER_H_
 
 #include <stddef.h>
 
@@ -39,4 +39,4 @@ class VideoCapturer {
 }  // test
 }  // webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_TEST_COMMON_VIDEO_CAPTURER_H_
+#endif  // WEBRTC_TEST_VIDEO_CAPTURER_H_