Index: chromecast/media/cdm/browser_cdm_cast.cc |
diff --git a/chromecast/media/cdm/browser_cdm_cast.cc b/chromecast/media/cdm/browser_cdm_cast.cc |
index b617ed6cd501a01f59ec124195de08e36b857172..e9ce78af4a6c285fe60170c77e07435ff6ab7385 100644 |
--- a/chromecast/media/cdm/browser_cdm_cast.cc |
+++ b/chromecast/media/cdm/browser_cdm_cast.cc |
@@ -8,6 +8,7 @@ |
#include "base/bind.h" |
#include "base/location.h" |
+#include "base/memory/ptr_util.h" |
#include "base/single_thread_task_runner.h" |
#include "base/thread_task_runner_handle.h" |
#include "chromecast/media/base/media_resource_tracker.h" |
@@ -25,7 +26,7 @@ namespace { |
template <typename... T> |
class CdmPromiseInternal : public ::media::CdmPromiseTemplate<T...> { |
public: |
- CdmPromiseInternal(scoped_ptr<::media::CdmPromiseTemplate<T...>> promise) |
+ CdmPromiseInternal(std::unique_ptr<::media::CdmPromiseTemplate<T...>> promise) |
: task_runner_(base::ThreadTaskRunnerHandle::Get()), |
promise_(std::move(promise)) {} |
@@ -57,7 +58,7 @@ class CdmPromiseInternal : public ::media::CdmPromiseTemplate<T...> { |
using ::media::CdmPromiseTemplate<T...>::RejectPromiseOnDestruction; |
scoped_refptr<base::SingleThreadTaskRunner> task_runner_; |
- scoped_ptr<::media::CdmPromiseTemplate<T...>> promise_; |
+ std::unique_ptr<::media::CdmPromiseTemplate<T...>> promise_; |
}; |
template <typename... T> |
@@ -71,9 +72,9 @@ void CdmPromiseInternal<T...>::resolve(const T&... result) { |
} |
template <typename... T> |
-scoped_ptr<CdmPromiseInternal<T...>> BindPromiseToCurrentLoop( |
- scoped_ptr<::media::CdmPromiseTemplate<T...>> promise) { |
- return make_scoped_ptr(new CdmPromiseInternal<T...>(std::move(promise))); |
+std::unique_ptr<CdmPromiseInternal<T...>> BindPromiseToCurrentLoop( |
+ std::unique_ptr<::media::CdmPromiseTemplate<T...>> promise) { |
+ return base::WrapUnique(new CdmPromiseInternal<T...>(std::move(promise))); |
} |
} // namespace |
@@ -152,7 +153,7 @@ void BrowserCdmCast::KeyIdAndKeyPairsToInfo( |
::media::CdmKeysInfo* keys_info) { |
DCHECK(keys_info); |
for (const std::pair<std::string, std::string>& key : keys) { |
- scoped_ptr<::media::CdmKeyInformation> cdm_key_information( |
+ std::unique_ptr<::media::CdmKeyInformation> cdm_key_information( |
new ::media::CdmKeyInformation(key.first, |
::media::CdmKeyInformation::USABLE, 0)); |
keys_info->push_back(cdm_key_information.release()); |
@@ -186,7 +187,7 @@ BrowserCdmCast* BrowserCdmCastUi::browser_cdm_cast() const { |
void BrowserCdmCastUi::SetServerCertificate( |
const std::vector<uint8_t>& certificate, |
- scoped_ptr<::media::SimpleCdmPromise> promise) { |
+ std::unique_ptr<::media::SimpleCdmPromise> promise) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
FORWARD_ON_CDM_THREAD( |
SetServerCertificate, certificate, |
@@ -197,7 +198,7 @@ void BrowserCdmCastUi::CreateSessionAndGenerateRequest( |
::media::MediaKeys::SessionType session_type, |
::media::EmeInitDataType init_data_type, |
const std::vector<uint8_t>& init_data, |
- scoped_ptr<::media::NewSessionCdmPromise> promise) { |
+ std::unique_ptr<::media::NewSessionCdmPromise> promise) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
FORWARD_ON_CDM_THREAD( |
CreateSessionAndGenerateRequest, session_type, init_data_type, init_data, |
@@ -207,7 +208,7 @@ void BrowserCdmCastUi::CreateSessionAndGenerateRequest( |
void BrowserCdmCastUi::LoadSession( |
::media::MediaKeys::SessionType session_type, |
const std::string& session_id, |
- scoped_ptr<::media::NewSessionCdmPromise> promise) { |
+ std::unique_ptr<::media::NewSessionCdmPromise> promise) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
FORWARD_ON_CDM_THREAD( |
LoadSession, session_type, session_id, |
@@ -217,7 +218,7 @@ void BrowserCdmCastUi::LoadSession( |
void BrowserCdmCastUi::UpdateSession( |
const std::string& session_id, |
const std::vector<uint8_t>& response, |
- scoped_ptr<::media::SimpleCdmPromise> promise) { |
+ std::unique_ptr<::media::SimpleCdmPromise> promise) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
FORWARD_ON_CDM_THREAD( |
UpdateSession, session_id, response, |
@@ -226,7 +227,7 @@ void BrowserCdmCastUi::UpdateSession( |
void BrowserCdmCastUi::CloseSession( |
const std::string& session_id, |
- scoped_ptr<::media::SimpleCdmPromise> promise) { |
+ std::unique_ptr<::media::SimpleCdmPromise> promise) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
FORWARD_ON_CDM_THREAD( |
CloseSession, session_id, |
@@ -235,7 +236,7 @@ void BrowserCdmCastUi::CloseSession( |
void BrowserCdmCastUi::RemoveSession( |
const std::string& session_id, |
- scoped_ptr<::media::SimpleCdmPromise> promise) { |
+ std::unique_ptr<::media::SimpleCdmPromise> promise) { |
DCHECK(thread_checker_.CalledOnValidThread()); |
FORWARD_ON_CDM_THREAD( |
RemoveSession, session_id, |