Clean up ownership of webrtc::VideoEncoder

webrtc/media/engine/simulcast_encoder_adapter.h

Index: webrtc/media/engine/simulcast_encoder_adapter.h
diff --git a/webrtc/media/engine/simulcast_encoder_adapter.h b/webrtc/media/engine/simulcast_encoder_adapter.h
index 68af74a5a347bcc60114cf2ea43c94fb3ede791e..03576f65878abd3ae6a3e14f66e673d04651771f 100644
--- a/webrtc/media/engine/simulcast_encoder_adapter.h
+++ b/webrtc/media/engine/simulcast_encoder_adapter.h
@@ -65,19 +65,18 @@ class SimulcastEncoderAdapter : public VP8Encoder {
 
  private:
   struct StreamInfo {
-    StreamInfo(VideoEncoder* encoder,
+    StreamInfo(std::unique_ptr<VideoEncoder> encoder,
                std::unique_ptr<EncodedImageCallback> callback,
                uint16_t width,
                uint16_t height,
                bool send_stream)
-        : encoder(encoder),
+        : encoder(std::move(encoder)),
           callback(std::move(callback)),
           width(width),
           height(height),
           key_frame_request(false),
           send_stream(send_stream) {}
-    // Deleted by SimulcastEncoderAdapter::DestroyStoredEncoders().
-    VideoEncoder* encoder;
+    std::unique_ptr<VideoEncoder> encoder;
     std::unique_ptr<EncodedImageCallback> callback;
     uint16_t width;
     uint16_t height;
@@ -108,7 +107,7 @@ class SimulcastEncoderAdapter : public VP8Encoder {
 
   // Store encoders in between calls to Release and InitEncode, so they don't
   // have to be recreated. Remaining encoders are destroyed by the destructor.
-  std::stack<VideoEncoder*> stored_encoders_;
+  std::stack<std::unique_ptr<VideoEncoder>> stored_encoders_;
 };
 
 }  // namespace webrtc