| 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 0a0b120c376f62da4b43cfa21bcb7e468d849b72..a86ff04e6d266680fa0e422373322bc78c2d9063 100644 | 
| --- a/content/renderer/media/media_stream_dependency_factory.h | 
| +++ b/content/renderer/media/media_stream_dependency_factory.h | 
| @@ -53,10 +53,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), | 
| @@ -151,10 +147,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, | 
| @@ -255,12 +247,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<P2PSocketDispatcher> p2p_socket_dispatcher_; | 
| scoped_refptr<WebRtcAudioDeviceImpl> audio_device_; | 
|  | 
|  |