Merge webrtc/video_engine/ into webrtc/video/

webrtc/test/fake_decoder.h

Index: webrtc/test/fake_decoder.h
diff --git a/webrtc/test/fake_decoder.h b/webrtc/test/fake_decoder.h
index d6f4f46e22e7d7e11942db1b5c4ffd01e27660e7..20f6bbf4d0d8fa60da535a71ba43bc2b4f46cd5e 100644
--- a/webrtc/test/fake_decoder.h
+++ b/webrtc/test/fake_decoder.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_DECODER_H_
-#define WEBRTC_VIDEO_ENGINE_TEST_COMMON_FAKE_DECODER_H_
+#ifndef WEBRTC_TEST_FAKE_DECODER_H_
+#define WEBRTC_TEST_FAKE_DECODER_H_
 
 #include <vector>
 
@@ -71,4 +71,4 @@ class FakeNullDecoder : public FakeDecoder {
 }  // namespace test
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_TEST_COMMON_FAKE_DECODER_H_
+#endif  // WEBRTC_TEST_FAKE_DECODER_H_