Also making member objects directly owned rather than using unique_ptr as that's no longer needed. Bug: webrtc:9870 Change-Id: I4bc85150d3b72b93fee05c85f79f20290cd5124d Reviewed-on: https://webrtc-review.googlesource.com/c/105480 Reviewed-by: Christoffer Rodbro <crodbro@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#25180}