Merge webrtc/video_engine/ into webrtc/video/

webrtc/test/fake_encoder.h

Index: webrtc/test/fake_encoder.h
diff --git a/webrtc/test/fake_encoder.h b/webrtc/test/fake_encoder.h
index d677b92e4dde0d860a24257f4bbc2e443116fc5d..88ff9d40f30bb52b940c26f6201c293489bf0959 100644
--- a/webrtc/test/fake_encoder.h
+++ b/webrtc/test/fake_encoder.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_VIDEO_ENGINE_TEST_COMMON_FAKE_ENCODER_H_
-#define WEBRTC_VIDEO_ENGINE_TEST_COMMON_FAKE_ENCODER_H_
+#ifndef WEBRTC_TEST_FAKE_ENCODER_H_
+#define WEBRTC_TEST_FAKE_ENCODER_H_
 
 #include <vector>
 
@@ -82,4 +82,4 @@ class DelayedEncoder : public test::FakeEncoder {
 }  // namespace test
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_TEST_COMMON_FAKE_ENCODER_H_
+#endif  // WEBRTC_TEST_FAKE_ENCODER_H_