Revert of Prepare for injectable SW decoders

webrtc/media/engine/videodecodersoftwarefallbackwrapper.h

Index: webrtc/media/engine/videodecodersoftwarefallbackwrapper.h
diff --git a/webrtc/media/engine/videodecodersoftwarefallbackwrapper.h b/webrtc/media/engine/videodecodersoftwarefallbackwrapper.h
index d6c3e0e0a849dbed59876c1bac6ea66f8fcd4ecb..3984e1f1cc5e9d271328ffc1f935609cf46e471b 100644
--- a/webrtc/media/engine/videodecodersoftwarefallbackwrapper.h
+++ b/webrtc/media/engine/videodecodersoftwarefallbackwrapper.h
@@ -21,10 +21,10 @@
 // Class used to wrap external VideoDecoders to provide a fallback option on
 // software decoding when a hardware decoder fails to decode a stream due to
 // hardware restrictions, such as max resolution.
-class VideoDecoderSoftwareFallbackWrapper : public VideoDecoder {
+class VideoDecoderSoftwareFallbackWrapper : public webrtc::VideoDecoder {
  public:
   VideoDecoderSoftwareFallbackWrapper(VideoCodecType codec_type,
-                                      std::unique_ptr<VideoDecoder> decoder);
+                                      VideoDecoder* decoder);
 
   int32_t InitDecode(const VideoCodec* codec_settings,
                      int32_t number_of_cores) override;
@@ -47,7 +47,7 @@
   bool InitFallbackDecoder();
 
   const VideoCodecType codec_type_;
-  std::unique_ptr<VideoDecoder> decoder_;
+  VideoDecoder* const decoder_;
   bool decoder_initialized_;
 
   VideoCodec codec_settings_;