| Index: chromecast/media/cma/ipc_streamer/decrypt_config_marshaller.h
|
| diff --git a/chromecast/media/cma/ipc_streamer/decrypt_config_marshaller.h b/chromecast/media/cma/ipc_streamer/decrypt_config_marshaller.h
|
| index 7d32d1b8bb8188625d2faff1d5b0f830d177d5b9..343a45cd0a63b303427db4b8434cb08b4f199508 100644
|
| --- a/chromecast/media/cma/ipc_streamer/decrypt_config_marshaller.h
|
| +++ b/chromecast/media/cma/ipc_streamer/decrypt_config_marshaller.h
|
| @@ -5,7 +5,7 @@
|
| #ifndef CHROMECAST_MEDIA_CMA_IPC_STREAMER_DECRYPT_CONFIG_MARSHALLER_H_
|
| #define CHROMECAST_MEDIA_CMA_IPC_STREAMER_DECRYPT_CONFIG_MARSHALLER_H_
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include <memory>
|
|
|
| namespace media {
|
| class DecryptConfig;
|
| @@ -22,7 +22,7 @@ class DecryptConfigMarshaller {
|
| static void Write(const CastDecryptConfig& config, MediaMessage* msg);
|
|
|
| // Returns a DecryptConfig from its serialized structure.
|
| - static scoped_ptr<CastDecryptConfig> Read(MediaMessage* msg);
|
| + static std::unique_ptr<CastDecryptConfig> Read(MediaMessage* msg);
|
| };
|
|
|
| } // namespace media
|
|
|