Merge webrtc/video_engine/ into webrtc/video/

webrtc/test/run_loop.h

Index: webrtc/test/run_loop.h
diff --git a/webrtc/test/run_loop.h b/webrtc/test/run_loop.h
index 31012525e2ea7b7e9598ee2e514eab222da7eec4..238e2dc28238a49b71898b359677acd8de279da8 100644
--- a/webrtc/test/run_loop.h
+++ b/webrtc/test/run_loop.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_RUN_LOOP_H_
-#define WEBRTC_VIDEO_ENGINE_TEST_COMMON_RUN_LOOP_H_
+#ifndef WEBRTC_TEST_RUN_LOOP_H_
+#define WEBRTC_TEST_RUN_LOOP_H_
 
 namespace webrtc {
 namespace test {
@@ -19,4 +19,4 @@ void PressEnterToContinue();
 }  // namespace test
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_TEST_COMMON_RUN_LOOP_H_
+#endif  // WEBRTC_TEST_RUN_LOOP_H_