diff --git a/talk/media/base/videoengine_unittest.h b/talk/media/base/videoengine_unittest.h index e4d2829e88..8fc3729d87 100644 --- a/talk/media/base/videoengine_unittest.h +++ b/talk/media/base/videoengine_unittest.h @@ -127,20 +127,6 @@ class VideoEngineOverride : public T { } }; -// Macroes that declare test functions for a given test class, before and after -// Init(). -// To use, define a test function called FooBody and pass Foo to the macro. -#define TEST_PRE_VIDEOENGINE_INIT(TestClass, func) \ - TEST_F(TestClass, func##PreInit) { \ - func##Body(); \ - } -#define TEST_POST_VIDEOENGINE_INIT(TestClass, func) \ - TEST_F(TestClass, func##PostInit) { \ - EXPECT_TRUE(engine_.Init(rtc::Thread::Current())); \ - func##Body(); \ - engine_.Terminate(); \ - } - template class VideoEngineTest : public testing::Test { protected: diff --git a/talk/media/webrtc/webrtcmediaengine.h b/talk/media/webrtc/webrtcmediaengine.h index 0fd8a74eb6..a3af1e73fb 100644 --- a/talk/media/webrtc/webrtcmediaengine.h +++ b/talk/media/webrtc/webrtcmediaengine.h @@ -32,7 +32,6 @@ namespace webrtc { class AudioDeviceModule; -class VideoCaptureModule; } namespace cricket { class WebRtcVideoDecoderFactory; @@ -43,7 +42,6 @@ namespace cricket { class WebRtcMediaEngineFactory { public: - static MediaEngineInterface* Create(); static MediaEngineInterface* Create( webrtc::AudioDeviceModule* adm, WebRtcVideoEncoderFactory* encoder_factory,