diff --git a/media/engine/fakewebrtcvcmfactory.h b/media/engine/fakewebrtcvcmfactory.h index 70931e129a..abd69ea78b 100644 --- a/media/engine/fakewebrtcvcmfactory.h +++ b/media/engine/fakewebrtcvcmfactory.h @@ -25,7 +25,7 @@ class FakeWebRtcVcmFactory : public cricket::WebRtcVcmFactoryInterface { const char* device_id) { if (!device_info.GetDeviceById(device_id)) return NULL; rtc::scoped_refptr module( - new rtc::RefCountedObject(this)); + new rtc::RefCountedObject()); modules.push_back(module); return module; } @@ -34,16 +34,8 @@ class FakeWebRtcVcmFactory : public cricket::WebRtcVcmFactoryInterface { } virtual void DestroyDeviceInfo(webrtc::VideoCaptureModule::DeviceInfo* info) { } - void OnDestroyed(webrtc::VideoCaptureModule* module) { - std::remove(modules.begin(), modules.end(), module); - } FakeWebRtcDeviceInfo device_info; std::vector> modules; }; -FakeWebRtcVideoCaptureModule::~FakeWebRtcVideoCaptureModule() { - if (factory_) - factory_->OnDestroyed(this); -} - #endif // MEDIA_ENGINE_FAKEWEBRTCVCMFACTORY_H_ diff --git a/media/engine/fakewebrtcvideocapturemodule.h b/media/engine/fakewebrtcvideocapturemodule.h index 0778abbcaa..741b5be785 100644 --- a/media/engine/fakewebrtcvideocapturemodule.h +++ b/media/engine/fakewebrtcvideocapturemodule.h @@ -18,14 +18,12 @@ #include "media/engine/webrtcvideocapturer.h" #include "rtc_base/task_queue_for_test.h" -class FakeWebRtcVcmFactory; - // Fake class for mocking out webrtc::VideoCaptureModule. class FakeWebRtcVideoCaptureModule : public webrtc::VideoCaptureModule { public: - explicit FakeWebRtcVideoCaptureModule(FakeWebRtcVcmFactory* factory) - : factory_(factory), callback_(NULL), running_(false) {} - ~FakeWebRtcVideoCaptureModule(); + FakeWebRtcVideoCaptureModule() + : callback_(NULL), running_(false) {} + ~FakeWebRtcVideoCaptureModule() {} void RegisterCaptureDataCallback( rtc::VideoSinkInterface* callback) override { callback_ = callback; @@ -81,7 +79,6 @@ class FakeWebRtcVideoCaptureModule : public webrtc::VideoCaptureModule { private: rtc::test::TaskQueueForTest task_queue_{"FakeWebRtcVideoCaptureModule"}; - FakeWebRtcVcmFactory* factory_; rtc::VideoSinkInterface* callback_; bool running_; webrtc::VideoCaptureCapability cap_;