diff --git a/webrtc/media/engine/webrtcvideochannelfactory.h b/webrtc/media/engine/webrtcvideochannelfactory.h deleted file mode 100644 index 06498beadd..0000000000 --- a/webrtc/media/engine/webrtcvideochannelfactory.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCHANNELFACTORY_H_ -#define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCHANNELFACTORY_H_ - -namespace cricket { -class VoiceMediaChannel; -class WebRtcVideoEngine2; -class WebRtcVideoChannel2; - -class WebRtcVideoChannelFactory { - public: - virtual ~WebRtcVideoChannelFactory() {} - virtual WebRtcVideoChannel2* Create(WebRtcVideoEngine2* engine, - VoiceMediaChannel* voice_channel) = 0; -}; -} // namespace cricket - -#endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCHANNELFACTORY_H_ diff --git a/webrtc/media/engine/webrtcvideoengine2.h b/webrtc/media/engine/webrtcvideoengine2.h index 4255b2d00e..39766190c0 100644 --- a/webrtc/media/engine/webrtcvideoengine2.h +++ b/webrtc/media/engine/webrtcvideoengine2.h @@ -26,7 +26,6 @@ #include "webrtc/media/base/videosourceinterface.h" #include "webrtc/call.h" #include "webrtc/media/base/mediaengine.h" -#include "webrtc/media/engine/webrtcvideochannelfactory.h" #include "webrtc/media/engine/webrtcvideodecoderfactory.h" #include "webrtc/media/engine/webrtcvideoencoderfactory.h" #include "webrtc/transport.h" @@ -55,6 +54,7 @@ class WebRtcDecoderObserver; class WebRtcEncoderObserver; class WebRtcLocalStreamInfo; class WebRtcRenderAdapter; +class WebRtcVideoChannel2; class WebRtcVideoChannelRecvInfo; class WebRtcVideoChannelSendInfo; class WebRtcVoiceEngine; diff --git a/webrtc/media/engine/webrtcvideoengine2_unittest.cc b/webrtc/media/engine/webrtcvideoengine2_unittest.cc index a4479560b5..0a40e0469d 100644 --- a/webrtc/media/engine/webrtcvideoengine2_unittest.cc +++ b/webrtc/media/engine/webrtcvideoengine2_unittest.cc @@ -22,7 +22,6 @@ #include "webrtc/media/engine/fakewebrtccall.h" #include "webrtc/media/engine/fakewebrtcvideoengine.h" #include "webrtc/media/engine/simulcast.h" -#include "webrtc/media/engine/webrtcvideochannelfactory.h" #include "webrtc/media/engine/webrtcvideoengine2.h" #include "webrtc/media/engine/webrtcvoiceengine.h" #include "webrtc/test/field_trial.h"