modules/video_coding refactorings

webrtc/modules/video_coding/test/vcm_payload_sink_factory.h

Index: webrtc/modules/video_coding/test/vcm_payload_sink_factory.h
diff --git a/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.h b/webrtc/modules/video_coding/test/vcm_payload_sink_factory.h
similarity index 84%
rename from webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.h
rename to webrtc/modules/video_coding/test/vcm_payload_sink_factory.h
index ec94bdc38229028119dbab3dc25ca7cd1405fbff..1de1cd6975a98efd118bfe7dbcd70b75e63d2584 100644
--- a/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.h
+++ b/webrtc/modules/video_coding/test/vcm_payload_sink_factory.h
@@ -8,13 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#ifndef WEBRTC_MODULES_VIDEO_CODING_TEST_VCM_PAYLOAD_SINK_FACTORY_H_
+#define WEBRTC_MODULES_VIDEO_CODING_TEST_VCM_PAYLOAD_SINK_FACTORY_H_
+
 #include <string>
 #include <vector>
 
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/scoped_ptr.h"
-#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h"
-#include "webrtc/modules/video_coding/main/test/rtp_player.h"
+#include "webrtc/modules/video_coding/include/video_coding_defines.h"
+#include "webrtc/modules/video_coding/test/rtp_player.h"
 
 class NullEventFactory;
 
@@ -61,3 +64,5 @@ class VcmPayloadSinkFactory : public PayloadSinkFactoryInterface {
 };
 }  // namespace rtpplayer
 }  // namespace webrtc
+
+#endif  // WEBRTC_MODULES_VIDEO_CODING_TEST_VCM_PAYLOAD_SINK_FACTORY_H_