Index: chromecast/browser/media/cast_mojo_media_application.h |
diff --git a/chromecast/browser/media/cast_mojo_media_application.h b/chromecast/browser/media/cast_mojo_media_application.h |
index a3bc9937216a176764ecdb0b8b15650962699aaa..393925c1b9e75a03e670f38f791048f3afe3ccef 100644 |
--- a/chromecast/browser/media/cast_mojo_media_application.h |
+++ b/chromecast/browser/media/cast_mojo_media_application.h |
@@ -5,8 +5,9 @@ |
#ifndef CHROMECAST_BROWSER_MEDIA_CAST_MOJO_MEDIA_APPLICATION_H_ |
#define CHROMECAST_BROWSER_MEDIA_CAST_MOJO_MEDIA_APPLICATION_H_ |
+#include <memory> |
+ |
#include "base/memory/ref_counted.h" |
-#include "base/memory/scoped_ptr.h" |
#include "media/mojo/interfaces/service_factory.mojom.h" |
#include "mojo/shell/public/cpp/interface_factory.h" |
#include "mojo/shell/public/cpp/message_loop_ref.h" |
@@ -30,7 +31,7 @@ class CastMojoMediaApplication |
public mojo::InterfaceFactory<::media::interfaces::ServiceFactory> { |
public: |
CastMojoMediaApplication( |
- scoped_ptr<CastMojoMediaClient> mojo_media_client, |
+ std::unique_ptr<CastMojoMediaClient> mojo_media_client, |
scoped_refptr<base::SingleThreadTaskRunner> media_task_runner); |
~CastMojoMediaApplication() final; |
@@ -46,7 +47,7 @@ class CastMojoMediaApplication |
mojo::InterfaceRequest<::media::interfaces::ServiceFactory> |
request) final; |
- scoped_ptr<CastMojoMediaClient> mojo_media_client_; |
+ std::unique_ptr<CastMojoMediaClient> mojo_media_client_; |
scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_; |
scoped_refptr<::media::MediaLog> media_log_; |
mojo::MessageLoopRefFactory ref_factory_; |