Reland of Merge webrtc/video_engine/ into webrtc/video/

webrtc/test/statistics.h

Index: webrtc/test/statistics.h
diff --git a/webrtc/test/statistics.h b/webrtc/test/statistics.h
index 0fc3a04ea9a7612b99f7844f7ab89382b9c2c6f6..d4a111e0615e8928305532c0aafbdec3660a875f 100644
--- a/webrtc/test/statistics.h
+++ b/webrtc/test/statistics.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_STATISTICS_H_
-#define WEBRTC_VIDEO_ENGINE_TEST_COMMON_STATISTICS_H_
+#ifndef WEBRTC_TEST_STATISTICS_H_
+#define WEBRTC_TEST_STATISTICS_H_
 
 #include "webrtc/typedefs.h"
 
@@ -33,4 +33,4 @@ class Statistics {
 }  // namespace test
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_TEST_COMMON_STATISTICS_H_
+#endif  // WEBRTC_TEST_STATISTICS_H_