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

webrtc/test/vcm_capturer.h

Index: webrtc/test/vcm_capturer.h
diff --git a/webrtc/test/vcm_capturer.h b/webrtc/test/vcm_capturer.h
index 80b0942434ec9fa71be504af03dc52ff6b6482a9..6c30dd50e017ba9466bc8b8ce8ffca522db4b078 100644
--- a/webrtc/test/vcm_capturer.h
+++ b/webrtc/test/vcm_capturer.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_VCM_CAPTURER_H_
-#define WEBRTC_VIDEO_ENGINE_TEST_COMMON_VCM_CAPTURER_H_
+#ifndef WEBRTC_TEST_VCM_CAPTURER_H_
+#define WEBRTC_TEST_VCM_CAPTURER_H_
 
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/common_types.h"
@@ -47,4 +47,4 @@ class VcmCapturer : public VideoCapturer, public VideoCaptureDataCallback {
 }  // test
 }  // webrtc
 
-#endif  // WEBRTC_VIDEO_ENGINE_TEST_COMMON_VCM_CAPTURER_H_
+#endif  // WEBRTC_TEST_VCM_CAPTURER_H_