Merge webrtc/video_engine/ into webrtc/video/

webrtc/test/frame_generator_capturer.h

Index: webrtc/test/frame_generator_capturer.h
diff --git a/webrtc/test/frame_generator_capturer.h b/webrtc/test/frame_generator_capturer.h
index 88b2e001bc721393cb6c8a024c71639a2249cab3..6bd0e0b3272c2c5cebefc6ea9afff870c2a78994 100644
--- a/webrtc/test/frame_generator_capturer.h
+++ b/webrtc/test/frame_generator_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_FRAME_GENERATOR_CAPTURER_H_
-#define WEBRTC_VIDEO_ENGINE_TEST_COMMON_FRAME_GENERATOR_CAPTURER_H_
+#ifndef WEBRTC_TEST_FRAME_GENERATOR_CAPTURER_H_
+#define WEBRTC_TEST_FRAME_GENERATOR_CAPTURER_H_
 
 #include <string>
 
@@ -74,4 +74,4 @@ class FrameGeneratorCapturer : public VideoCapturer {
 }  // test
 }  // webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_TEST_COMMON_FRAME_GENERATOR_CAPTURER_H_
+#endif  // WEBRTC_TEST_FRAME_GENERATOR_CAPTURER_H_