Index: content/renderer/media/media_stream_dependency_factory.h |
diff --git a/content/renderer/media/media_stream_dependency_factory.h b/content/renderer/media/media_stream_dependency_factory.h |
index 5114a41e83fffd2baa64904f44eb17c797474aaf..e4bbee984caa7ab0886ad5f5028c5f3af12a8a3e 100644 |
--- a/content/renderer/media/media_stream_dependency_factory.h |
+++ b/content/renderer/media/media_stream_dependency_factory.h |
@@ -54,10 +54,6 @@ class WebRtcLoggingHandlerImpl; |
class WebRtcLoggingMessageFilter; |
struct StreamDeviceInfo; |
-#if defined(GOOGLE_TV) |
-class RTCVideoDecoderFactoryTv; |
-#endif |
- |
// Object factory for RTC MediaStreams and RTC PeerConnections. |
class CONTENT_EXPORT MediaStreamDependencyFactory |
: NON_EXPORTED_BASE(public base::NonThreadSafe), |
@@ -146,10 +142,6 @@ class CONTENT_EXPORT MediaStreamDependencyFactory |
WebRtcAudioDeviceImpl* GetWebRtcAudioDevice(); |
-#if defined(GOOGLE_TV) |
- RTCVideoDecoderFactoryTv* decoder_factory_tv() { return decoder_factory_tv_; } |
-#endif |
- |
static void AddNativeTrackToBlinkTrack( |
webrtc::MediaStreamTrackInterface* native_track, |
const blink::WebMediaStreamTrack& webkit_track, |
@@ -249,12 +241,6 @@ class CONTENT_EXPORT MediaStreamDependencyFactory |
scoped_refptr<webrtc::PeerConnectionFactoryInterface> pc_factory_; |
-#if defined(GOOGLE_TV) |
- // |pc_factory_| will hold the ownership of this object, and |pc_factory_| |
- // outlives this object. Thus weak pointer is sufficient. |
- RTCVideoDecoderFactoryTv* decoder_factory_tv_; |
-#endif |
- |
scoped_refptr<VideoCaptureImplManager> vc_manager_; |
scoped_refptr<P2PSocketDispatcher> p2p_socket_dispatcher_; |
scoped_refptr<WebRtcAudioDeviceImpl> audio_device_; |