Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder

webrtc/media/engine/webrtcvideoengine.h

 /*
  *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 299 matching lines @@
       webrtc::VideoEncoderConfig encoder_config;
     };
 
     class AllocatedEncoder {
      public:
       AllocatedEncoder() = default;
       AllocatedEncoder(AllocatedEncoder&&) = default;
       AllocatedEncoder& operator=(AllocatedEncoder&&) = default;
 
       AllocatedEncoder(std::unique_ptr<webrtc::VideoEncoder> encoder,
-                       std::unique_ptr<webrtc::VideoEncoder> external_encoder,
+                       bool is_external,
                        const cricket::VideoCodec& codec,
                        bool has_internal_source);
 
       // Returns a raw pointer to the allocated encoder. This object still has
       // ownership of the encoder and is responsible for deleting it.
       webrtc::VideoEncoder* encoder() { return encoder_.get(); }
 
       // Returns true if the encoder is external.
-      bool IsExternal() { return static_cast<bool>(external_encoder_); }
+      bool IsExternal() { return is_external_; }
 
       cricket::VideoCodec codec() { return codec_; }
 
       bool HasInternalSource() { return has_internal_source_; }
 
       // Release the encoders this object manages.
       void Reset();
 
      private:
       std::unique_ptr<webrtc::VideoEncoder> encoder_;
-      // TODO(magjed): |external_encoder_| is not used except for managing
-      // the lifetime when we use VideoEncoderSoftwareFallbackWrapper. Let
-      // VideoEncoderSoftwareFallbackWrapper own the external encoder instead
-      // and remove this member variable.
-      std::unique_ptr<webrtc::VideoEncoder> external_encoder_;
+      bool is_external_;
       cricket::VideoCodec codec_;
       bool has_internal_source_;
     };
 
     rtc::scoped_refptr<webrtc::VideoEncoderConfig::EncoderSpecificSettings>
     ConfigureVideoEncoderSettings(const VideoCodec& codec);
     // Creates and returns a new AllocatedEncoder of the specified codec type.
     AllocatedEncoder CreateVideoEncoder(const VideoCodec& codec);
     void SetCodec(const VideoCodecSettings& codec,
                   bool force_encoder_allocation);
@@ skipping 212 matching lines @@
   const std::string codec_name_;
   const int max_qp_;
   const int max_framerate_;
   const bool is_screencast_;
   const bool conference_mode_;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_