Merge webrtc/video_engine/ into webrtc/video/

webrtc/test/null_transport.h

Index: webrtc/test/null_transport.h
diff --git a/webrtc/test/null_transport.h b/webrtc/test/null_transport.h
index f4b704634d1c533b7be5a417e05167536a5dabbe..c49883e1dc099578d1d59f4d558e63d571e6aa74 100644
--- a/webrtc/test/null_transport.h
+++ b/webrtc/test/null_transport.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_NULL_TRANSPORT_H_
-#define WEBRTC_VIDEO_ENGINE_TEST_COMMON_NULL_TRANSPORT_H_
+#ifndef WEBRTC_TEST_NULL_TRANSPORT_H_
+#define WEBRTC_TEST_NULL_TRANSPORT_H_
 
 #include "webrtc/transport.h"
 
@@ -27,4 +27,4 @@ class NullTransport : public Transport {
 }  // namespace test
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_TEST_COMMON_NULL_TRANSPORT_H_
+#endif  // WEBRTC_TEST_NULL_TRANSPORT_H_